Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

.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

package.json

@@ -27,7 +27,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",

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 => {