okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
vapormusic 2022-02-08 10:19:07 +07:00
commit 78005636ad
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config.yml
View file

@ -43,8 +43,8 @@ jobs:
- store_test_results: - store_test_results:
path: test-results path: test-results
- run: - run:
name: Append Commit SHA to Version name: Append Commit BuildID to Version
command: yarn circle:append-sha command: yarn circle:append-bid
- run: - run:
name: Generate Builds (Linux) name: Generate Builds (Linux)
command: yarn dist -l -p never command: yarn dist -l -p never

2
package.json
View file

@ -27,7 +27,7 @@
"dist:all": "yarn build && electron-builder -mwl", "dist:all": "yarn build && electron-builder -mwl",
"msft": "yarn build && electron-builder -c msft-package.json", "msft": "yarn build && electron-builder -c msft-package.json",
"postinstall": "electron-builder install-app-deps", "postinstall": "electron-builder install-app-deps",
"circle:append-sha": "node resources/appendCommitToVersion" "circle:append-bid": "node resources/appendBIDToVersion"
}, },
"dependencies": { "dependencies": {
"@sentry/electron": "^2.5.4", "@sentry/electron": "^2.5.4",

3
resources/appendCommitToVersion.js
View file

@ -8,9 +8,10 @@ let fs = require('fs')
var data = fs.readFileSync('package.json'); var data = fs.readFileSync('package.json');
var package = JSON.parse(data); var package = JSON.parse(data);
pvers = package.version.match(/\d+\./g)
// https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables // 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 => { fs.writeFile('package.json', JSON.stringify(package), err => {