diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-14 11:36:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-08-14 11:37:08 +0200 |
| commit | b120645e8cfc578c2e828d9388eb9e4ab46ab94d (patch) | |
| tree | d07504f50371aca7c3e93042cff764bd2b4d8fbd | |
| parent | 05ccbe9a299116c50d6e99042c1eb4e45119c78a (diff) | |
| parent | fa1e9c68a72fe8a17b6cb1ce473fd79388b2b61e (diff) | |
Merge #16595: travis: use extended 90 minute timeout when available
fa1e9c68a72fe8a17b6cb1ce473fd79388b2b61e travis: Bump timeout from 50 minutes to 90 (MarcoFalke)
Pull request description:
The default is 50 minutes, see https://docs.travis-ci.com/user/customizing-the-build#build-timeouts
Travis is willing to raise the default for the `bitcoin/bitcoin` repo slug to 90 minutes, see https://github.com/bitcoin/bitcoin/pull/16595#issuecomment-520917665
This allows us to bypass the "exit early to save the depends or compiler cache" for `bitcoin/bitcoin`, but not for forks of this repo.
Fixes #16148
ACKs for top commit:
practicalswift:
ACK fa1e9c68a72fe8a17b6cb1ce473fd79388b2b61e -- diff looks correct
laanwj:
ACK fa1e9c68a72fe8a17b6cb1ce473fd79388b2b61e
fanquake:
ACK fa1e9c68a72fe8a17b6cb1ce473fd79388b2b61e
Tree-SHA512: dbd929729dadbff756ac66a6d7b58d633a06396c0c08738c93adba6cbc08f0462c07f9883b8b76d26af4f3056d43f6359cf562aa8bcad0412aa7f4281274231d
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 422e9149f4..d49c116a5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,8 +64,10 @@ before_script: script: - export CONTINUE=1 - if [ $SECONDS -gt 1200 ]; then export CONTINUE=0; fi # Likely the depends build took very long + - if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # Whitelisted repo (90 minutes build time) - if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi - if [ $SECONDS -gt 2000 ]; then export CONTINUE=0; fi # Likely the build took very long; The tests take about 1000s, so we should abort if we have less than 50*60-1000=2000s left + - if [ $TRAVIS_REPO_SLUG = "bitcoin/bitcoin" ]; then export CONTINUE=1; fi # Whitelisted repo (90 minutes build time) - if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi after_script: - echo $TRAVIS_COMMIT_RANGE |