Fix branch detection when setting the canary icon (#2499)

* Fix branch detection

* Use the canary icon on Windows as well

* Add missing space

* `TRAVIS_BRANCH` will be `canary` when a PR targets such branch
This commit is contained in:
Matheus Fernandes 2017-12-05 02:41:51 -08:00 committed by Leo Lamprecht
parent 0549ded2c4
commit 0d5dba5cd8

View file

@ -33,9 +33,10 @@ install:
- yarn - yarn
after_success: after_success:
- if [[ "$TRAVIS_BRANCH" == "canary" ]]; then cp build/canary.icns build/icon.icns; fi - (git branch --contains $TRAVIS_COMMIT | grep canary > /dev/null || [[ "$TRAVIS_BRANCH" == "canary" ]] ) && (cd build; cp canary.icns icon.icns; cp canary.ico icon.ico)
- yarn run dist - yarn run dist
branches: branches:
except: except:
- "/^v\\d+\\.\\d+\\.\\d+$/" - "/^v\\d+\\.\\d+\\.\\d+$/"