diff options
| author | bors <bors@rust-lang.org> | 2017-11-30 01:28:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-30 01:28:44 +0000 |
| commit | 78fcf338833bd265c7f8dd1e46caf02b66039bb8 (patch) | |
| tree | abee5d5aa36a353f411b636643b3d720d33fa35d | |
| parent | 74bc14d0fee95816e17fe44946e247472fb0770d (diff) | |
| parent | 6b5f430a6cfacb79a6332246120dc7699bd2d03c (diff) | |
| download | rust-78fcf338833bd265c7f8dd1e46caf02b66039bb8.tar.gz rust-78fcf338833bd265c7f8dd1e46caf02b66039bb8.zip | |
Auto merge of #46366 - kennytm:revert-46360, r=kennytm
Revert #46360, re-enable macOS dist images. This PR reverts #46360, which disabled all macOS dist images to workaround travis-ci/travis-ci#8821. This PR should be merged as soon as the Travis bug has been fixed. Closes #46357. cc @rust-lang/infra
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 320759b9233..8ce3aadaccd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,6 @@ 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" @@ -38,7 +36,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = disabled + if: branch = auto # macOS builders. These are placed near the beginning because they are very # slow to run. @@ -93,7 +91,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = disabled + if: branch = auto - env: > RUST_CHECK_TARGET=dist @@ -107,7 +105,7 @@ matrix: NO_DEBUG_ASSERTIONS=1 os: osx osx_image: xcode7.3 - if: branch = disabled + if: branch = auto # Linux builders, remaining docker images - env: IMAGE=arm-android |