Skip to content

Commit 6b5f430

Browse files
committed
Revert "Auto merge of #46360 - kennytm:workaround-travis-8821, r=kennytm"
This reverts commit dc0e227, reversing changes made to 77ab3a1. [skip ci]
1 parent dc0e227 commit 6b5f430

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.travis.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ 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
3028
- env: >
3129
RUST_CHECK_TARGET=dist
3230
RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler"
@@ -39,7 +37,7 @@ matrix:
3937
NO_DEBUG_ASSERTIONS=1
4038
os: osx
4139
osx_image: xcode7.3
42-
if: branch = disabled
40+
if: branch = auto
4341
4442
# macOS builders. These are placed near the beginning because they are very
4543
# slow to run.
@@ -94,7 +92,7 @@ matrix:
9492
NO_DEBUG_ASSERTIONS=1
9593
os: osx
9694
osx_image: xcode7.3
97-
if: branch = disabled
95+
if: branch = auto
9896
9997
- env: >
10098
RUST_CHECK_TARGET=dist
@@ -108,7 +106,7 @@ matrix:
108106
NO_DEBUG_ASSERTIONS=1
109107
os: osx
110108
osx_image: xcode7.3
111-
if: branch = disabled
109+
if: branch = auto
112110
113111
# Linux builders, remaining docker images
114112
- env: IMAGE=arm-android

0 commit comments

Comments
 (0)