Skip to content

Commit

Permalink
Revert "Auto merge of #46360 - kennytm:workaround-travis-8821, r=kenn…
Browse files Browse the repository at this point in the history
…ytm"

This reverts commit dc0e227, reversing
changes made to 77ab3a1.

[skip ci]
  • Loading branch information
kennytm committed Nov 29, 2017
1 parent dc0e227 commit 6b5f430
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Expand Up @@ -25,8 +25,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"
Expand All @@ -39,7 +37,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.
Expand Down Expand Up @@ -94,7 +92,7 @@ matrix:
NO_DEBUG_ASSERTIONS=1
os: osx
osx_image: xcode7.3
if: branch = disabled
if: branch = auto
- env: >
RUST_CHECK_TARGET=dist
Expand All @@ -108,7 +106,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
Expand Down

0 comments on commit 6b5f430

Please sign in to comment.