From a215a34fdb6436148476bfb750ec6fd7024c2fec Mon Sep 17 00:00:00 2001 From: nukeop <12746779+nukeop@users.noreply.github.com> Date: Sat, 6 Jul 2019 23:34:53 +0200 Subject: [PATCH] Rolling release setup (#392) * Publish on every commit * Correct malformed json * Create releaseInfo key * Publish always --- .travis.yml | 3 +++ package.json | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1afb9e3664..97c14332d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ matrix: language: node_js node_js: "8" +env: + global: + - GITHASH=${TRAVIS_COMMIT::6} before_install: - if [ $TRAVIS_OS_NAME = linux ]; then sudo apt-get install libdbus-1-dev -y; fi diff --git a/package.json b/package.json index 3b586d32e0..2e8c9e8165 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ "test": "mocha --require babel-register --require babel-polyfill --require ignore-styles --timeout 10000 --prof", "pack": "electron-builder --dir -c.extraMetadata.main=dist/bundle.electron.js", "dist": "babel-node electron-builder -c.extraMetadata.main=dist/bundle.electron.js", - "build:linux": "electron-builder -c.extraMetadata.main=dist/bundle.electron.js --linux", - "build:windows": "electron-builder -c.extraMetadata.main=dist/bundle.electron.js --windows", - "build:macos": "electron-builder -c.extraMetadata.main=dist/bundle.electron.js --macos", + "build:linux": "electron-builder -c.extraMetadata.main=dist/bundle.electron.js --linux --publish always", + "build:windows": "electron-builder -c.extraMetadata.main=dist/bundle.electron.js --windows --publish always", + "build:macos": "electron-builder -c.extraMetadata.main=dist/bundle.electron.js --macos --publish always", "build:all": "electron-builder -c.extraMetadata.main=dist/bundle.electron.js -mwl", "lint": "eslint app", "i18n": "sync-i18n --files 'app/locales/*.json' --primary en --languages fr nl de dk es pl zh ru --space 2" @@ -112,7 +112,7 @@ "classnames": "^2.2.5", "css-loader": "^1.0.0", "electron": "^4.0.2", - "electron-builder": "^20.38.5", + "electron-builder": "^20.44.4", "electron-devtools-installer": "^2.2.4", "enzyme": "^3.3.0", "enzyme-adapter-react-16": "^1.3.1", @@ -158,6 +158,7 @@ "build": { "appId": "nuclear", "productName": "nuclear", + "artifactName": "${productName}-${env.GITHASH}.${ext}", "directories": { "output": "release" }, @@ -169,6 +170,9 @@ "extraFiles": [ "resources" ], + "releaseInfo": { + "releaseName": "Nuclear ${env.GITHASH}" + }, "linux": { "desktop": { "Name": "Nuclear", @@ -196,6 +200,9 @@ "nsis", "portable" ] + }, + "nsis": { + "artifactName": "${productName} Setup ${env.GITHASH}.${ext}" } } }