From: riqo Date: Tue, 13 Apr 2021 12:57:14 +0000 (-0500) Subject: test build X-Git-Tag: v0.9.0~1 X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=f66c9ccfc247e97a9d1e5a2993a11df78d56f9f2;p=mime-chat test build --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98602a6..656b148 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,60 @@ -variables: - VERSION_ID: '1.0:$CI_PIPELINE_ID' - stages: - - build + - Build + - Upload + - Release build: - image: crimata/electron-builder-mac - stage: build - artifacts: - paths: - - $CI_PROJECT_DIR/dist/*.* - script: - - yarn dist + stage: Build + image: electronuserland/builder:wine + before_script: + - yarn + script: + - export VERSION=$(node -e "console.log(require('./package.json').version)") + - echo "VERSION=$VERSION" >> variables.env + - export APPNAME=$(node -e "console.log(require('./package.json').productName)") + - echo "APPNAME=$APPNAME" >> variables.env + - npm run build + artifacts: + reports: + dotenv: variables.env + name: $CI_COMMIT_REF_SLUG + paths: + - $CI_PROJECT_DIR/dist/*.* + when: on_success + only: + - master + +variables: + WIN_BINARY: '${APPNAME}-${VERSION}.exe' + PACKAGE_REGISTRY_URL: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${APPNAME}/${VERSION}' + +upload: + stage: Upload + needs: + - job: build + artifacts: true + rules: + - if: $CI_COMMIT_TAG + when: never # Do not run this job when a tag is created manually + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when when commits are pushed to the default branch + script: + - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file "./dist/${WIN_BINARY}" "${PACKAGE_REGISTRY_URL}/${WIN_BINARY}"' + +auto-release-master: + image: registry.gitlab.com/gitlab-org/release-cli + needs: + - job: build + artifacts: true + - job: upload + artifacts: true + stage: Release + rules: + - if: $CI_COMMIT_TAG + when: never # Do not run this job when a tag is created manually + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when when commits are pushed to the default branch + script: + - echo "Release $VERSION" + - | + release-cli create --name "Release $VERSION" --tag-name v$VERSION \ + --description 'Created using the release-cli. $CI_COMMIT_TITLE' --ref $CI_COMMIT_SHA \ + --assets-link "{\"name\":\"${APPNAME}\",\"url\":\"${PACKAGE_REGISTRY_URL}/${WIN_BINARY}\"}" diff --git a/package.json b/package.json index 582b731..956284f 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,30 @@ "postuninstal": "electron-builder install-app-deps", "dist":"electron-builder --publish always", "dev": "vue-cli-service electron:serve", - "build": "vue-cli-service electron:build" + "build": "electron-builder --win" }, "repository": { "type" : "git", - "url" : "https://gitlab.com/crimata/electron-app.git" + "url" : "https://gitlab.com/crimata/electron-app.git", + "release": "latest" + }, + "build": { + "artifactName": "${productName}-${version}.${ext}", + "publish": { + "provider": "generic", + "url": "https://gitlab.com/api/v4/projects/25637892/jobs/artifacts/master/raw/dist?job=build" + }, + "win": { + "target": [ + "nsis" + ], + "verifyUpdateCodeSignature": false + }, + "linux": { + "target": [ + "AppImage" + ] + } }, "dependencies": { "@google-cloud/speech": "^4.2.0", diff --git a/vue.config.js b/vue.config.js index 9febf55..f2ae6a0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -21,7 +21,8 @@ module.exports = { builderOptions: { // TODO electron-builder config https://www.electron.build/configuration/configuration appId: "com.crimata.messenger", - productName: "Crimata Messenger" + productName: "Crimata Messenger", + }, preload: "src/preload.ts" }