Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

[travis] only increase timeout for mac build #2096

Merged
merged 3 commits into from
Apr 11, 2017
Merged

[travis] only increase timeout for mac build #2096

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7833f03
[travis] only increase timeout for mac build
Mar 31, 2017
f04fc79
Merge branch 'develop' into luclu_travis-remove-timout-hide
Apr 3, 2017
a2f87f8
fix
Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ install:

script:
- if [[ $TRAVIS_BRANCH != "master" ]]; then unset CSC_LINK CSC_KEY_PASSWORD; fi # disable macOS code-signing (production certificate) on develop branch
- travis_wait 60 gulp --$GULP_PLATFORM
- if [[ $GULP_PLATFORM == "mac" ]]; then travis_wait 60 gulp --$GULP_PLATFORM; fi # increase timeout for slower mac builds
- if [[ $GULP_PLATFORM != "mac" ]]; then gulp --$GULP_PLATFORM; fi
- if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi # also build wallet if on master branch
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi # prepare for integration testing
- if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi

after_success:
Expand Down