diff options
| author | bors <bors@rust-lang.org> | 2014-06-05 18:36:56 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-05 18:36:56 -0700 |
| commit | e14bc6698a8d7f961e3205c94184396f539062bd (patch) | |
| tree | 31663745373e35c316e10e9acc427ef6725d1666 | |
| parent | 5ec49c7924e7ef756e767bcecd4a3de1147c3545 (diff) | |
| parent | bc1789711666f4d29b04ae6aa7da3670e2ddf83e (diff) | |
auto merge of #14653 : alexcrichton/rust/travis-opt, r=cmr
The most frequent failure for our travis builds is running into the timeout limits when building the compiler itself. Building librustc takes a very long amount of time, often hitting the 10 minutes with no output threshold that travis imposes on us. This commit switches the relevant `make` step to being wrapped in the `travis_wait` command [1]. This command will print something once a minute so as to not time out a build. This will hopefully enable us to have fewer flaky builds on travis! [1]: http://docs.travis-ci.com/user/build-timeouts/
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 165c070633a..76e3af05d55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ script: | if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi fi && make tidy && - make -j4 rustc-stage1 && + travis_wait make -j4 rustc-stage1 && make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc env: |