Travis: Setup mac keychain before building C++

This commit is contained in:
Ben Gotow 2017-08-31 12:27:07 -07:00
parent 2e1b33c5f6
commit c4488cbc7b
4 changed files with 6 additions and 5 deletions

View file

@ -77,6 +77,7 @@ before_install:
git submodule update --init mailsync git submodule update --init mailsync
script: script:
- npm run ci-setup-mac-keychain
- mailsync/build.sh - mailsync/build.sh
- mv ./mailsync ./mailsync-src - mv ./mailsync ./mailsync-src
- DEBUG=electron-packager,electron-osx-sign npm run build - DEBUG=electron-packager,electron-osx-sign npm run build

View file

@ -78,12 +78,11 @@ module.exports = (grunt) => {
// The Windows electron-winstaller task must be run outside of grunt // The Windows electron-winstaller task must be run outside of grunt
]); ]);
} else if (grunt.option('platform') === 'darwin') { } else if (grunt.option('platform') === 'darwin') {
const subTasks = process.env.SIGN_BUILD ? ["setup-mac-keychain"] : [] grunt.registerTask("build-client", [
grunt.registerTask("build-client", subTasks.concat([
"package", "package",
"create-mac-zip", "create-mac-zip",
"create-mac-dmg", "create-mac-dmg",
])); ]);
} else if (grunt.option('platform') === 'linux') { } else if (grunt.option('platform') === 'linux') {
grunt.registerTask("build-client", [ grunt.registerTask("build-client", [
"package", "package",

@ -1 +1 @@
Subproject commit ca93826adb2fdacc43e0626a2a69cb772aef054c Subproject commit dda1be26cb78aa47362c80689e0017e7dc2c5df9

View file

@ -68,6 +68,7 @@
"test": "app/node_modules/.bin/electron ./app --enable-logging --test", "test": "app/node_modules/.bin/electron ./app --enable-logging --test",
"test-window": "app/node_modules/.bin/electron ./app --enable-logging --test=window", "test-window": "app/node_modules/.bin/electron ./app --enable-logging --test=window",
"build": "grunt build-client --gruntfile=app/build/Gruntfile.js --base=./", "build": "grunt build-client --gruntfile=app/build/Gruntfile.js --base=./",
"build-docs": "grunt docs --gruntfile=app/build/Gruntfile.js --base=./ && mkdir -p app/dist-docs && cp README.md ./app/build/docs_src/README.md && gitbook --gitbook=latest build . ./app/dist-docs --log=debug --debug && rm ./app/build/docs_src/README.md && rm -rf ./app/build/docs_src/classes" "build-docs": "grunt docs --gruntfile=app/build/Gruntfile.js --base=./ && mkdir -p app/dist-docs && cp README.md ./app/build/docs_src/README.md && gitbook --gitbook=latest build . ./app/dist-docs --log=debug --debug && rm ./app/build/docs_src/README.md && rm -rf ./app/build/docs_src/classes",
"ci-setup-mac-keychain": "grunt setup-mac-keychain --gruntfile=app/build/Gruntfile.js --base=./"
} }
} }