diff options
| author | bors <bors@rust-lang.org> | 2017-11-29 09:44:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-29 09:44:04 +0000 |
| commit | dc0e227745765c198958f0298785d18bcf61d4ae (patch) | |
| tree | 8149b46d42ad49c22393917edcbe26298df249bc | |
| parent | 77ab3a1d5ff69c0cb3eb85a75ef734eaf7429f1b (diff) | |
| parent | 666c24136b6c433ea67909b05de1a3f6a26ce3d7 (diff) | |
| download | rust-dc0e227745765c198958f0298785d18bcf61d4ae.tar.gz rust-dc0e227745765c198958f0298785d18bcf61d4ae.zip | |
Auto merge of #46360 - kennytm:workaround-travis-8821, r=kennytm
Disable all macOS dist images to workaround travis-ci/travis-ci#8821 See: travis-ci/travis-ci#8821 Currently the [Travis status](https://www.traviscistatus.com/) is all green, I don't know how long it takes Travis to notice and fix it, so I'm merging this in immediately to keep the queue running today. cc @rust-lang/infra
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 278d98673db..4ff548c4b80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ matrix: - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 if: branch = try OR branch = auto + # FIXME: The macOS dist images are temporarily disabled until Travis bug is fixed + # https://github.com/travis-ci/travis-ci/issues/8821 - env: > RUST_CHECK_TARGET=dist RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler" @@ -37,7 +39,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = auto + if: branch = disabled # macOS builders. These are placed near the beginning because they are very # slow to run. @@ -92,7 +94,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = auto + if: branch = disabled - env: > RUST_CHECK_TARGET=dist @@ -106,7 +108,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = auto + if: branch = disabled # Linux builders, remaining docker images - env: IMAGE=arm-android |