Merge release back into master #1973

Merged
neb-b merged 8 commits from release.0.25.1 into master 2018-09-19 01:07:37 +02:00
Showing only changes of commit 267411f30e - Show all commits

View file

@ -39,7 +39,7 @@ script:
docker run $ENVS --rm \ docker run $ENVS --rm \
-v ${PWD}:/project \ -v ${PWD}:/project \
electronuserland/builder:wine \ electronuserland/builder:wine \
/bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn build --win --publish onTag"; /bin/bash -c "env | grep -v '\r' | grep -iE 'DEBUG|TARGET|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_|WIN_' && yarn --link-duplicates --pure-lockfile && yarn build --win --publish onTag";
fi fi
- if [ "$TARGET" == "mac" ]; then yarn build --publish onTag; fi - if [ "$TARGET" == "mac" ]; then yarn build --publish onTag; fi
- if [ "$TARGET" == "linux" ]; then yarn --link-duplicates --pure-lockfile && yarn - if [ "$TARGET" == "linux" ]; then yarn --link-duplicates --pure-lockfile && yarn