Skip to content

Commit

Permalink
Auto merge of rust-lang#46360 - kennytm:workaround-travis-8821, r=ken…
Browse files Browse the repository at this point in the history
…nytm

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
  • Loading branch information
bors committed Nov 29, 2017
2 parents 77ab3a1 + 666c241 commit dc0e227
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit dc0e227

Please sign in to comment.