Skip to content

Commit dc0e227

Browse files
committed
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
2 parents 77ab3a1 + 666c241 commit dc0e227

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

.travis.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ matrix:
2525
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
2626
if: branch = try OR branch = auto
2727

28+
# FIXME: The macOS dist images are temporarily disabled until Travis bug is fixed
29+
# https://github.com/travis-ci/travis-ci/issues/8821
2830
- env: >
2931
RUST_CHECK_TARGET=dist
3032
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler"
@@ -37,7 +39,7 @@ matrix:
3739
NO_DEBUG_ASSERTIONS=1
3840
os: osx
3941
osx_image: xcode7.3
40-
if: branch = auto
42+
if: branch = disabled
4143
4244
# macOS builders. These are placed near the beginning because they are very
4345
# slow to run.
@@ -92,7 +94,7 @@ matrix:
9294
NO_DEBUG_ASSERTIONS=1
9395
os: osx
9496
osx_image: xcode7.3
95-
if: branch = auto
97+
if: branch = disabled
9698
9799
- env: >
98100
RUST_CHECK_TARGET=dist
@@ -106,7 +108,7 @@ matrix:
106108
NO_DEBUG_ASSERTIONS=1
107109
os: osx
108110
osx_image: xcode7.3
109-
if: branch = auto
111+
if: branch = disabled
110112
111113
# Linux builders, remaining docker images
112114
- env: IMAGE=arm-android

0 commit comments

Comments
 (0)