diff --git a/.circleci/config.yml b/.circleci/config.yml index 0427fa0c..b9f291ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,8 +43,8 @@ jobs: - store_test_results: path: test-results - run: - name: Append Commit SHA to Version - command: yarn circle:append-sha + name: Append Commit BuildID to Version + command: yarn circle:append-bid - run: name: Generate Builds (Linux) command: yarn dist -l -p never diff --git a/package.json b/package.json index 3c6db051..484c8170 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "cider", "applicationId": "Cider", "productName": "Cider", - "version": "1.1", + "version": "1.1.0", "description": "A new look into listening and enjoying music in style and performance.", "license": "AGPL-3.0", "main": "./build/index.js", @@ -26,7 +26,7 @@ "dist:all": "yarn build && electron-builder -mwl", "msft": "yarn build && electron-builder -c msft-package.json", "postinstall": "electron-builder install-app-deps", - "circle:append-sha": "node resources/appendCommitToVersion" + "circle:append-bid": "node resources/appendBIDToVersion" }, "dependencies": { "@sentry/electron": "^2.5.4", diff --git a/resources/appendCommitToVersion.js b/resources/appendCommitToVersion.js index b22c418e..123deba9 100644 --- a/resources/appendCommitToVersion.js +++ b/resources/appendCommitToVersion.js @@ -8,9 +8,10 @@ let fs = require('fs') var data = fs.readFileSync('package.json'); var package = JSON.parse(data); +pvers = package.version.match(/\d+\./g) // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables -package.version = `${package.version}.${process.env['CIRCLE_BUILD_NUM']}` +package.version = `${pvers[0]}.${pvers[1]}.${process.env['CIRCLE_BUILD_NUM']}` fs.writeFile('package.json', JSON.stringify(package), err => {