summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2017-11-29 21:03:53 +0800
committerkennytm <kennytm@gmail.com>2017-11-29 21:03:53 +0800
commit6b5f430a6cfacb79a6332246120dc7699bd2d03c (patch)
tree144b2cfaf519c4a307ecf44eecd35efb9d55346b /.travis.yml
parentAuto merge of #46360 - kennytm:workaround-travis-8821, r=kennytm (diff)
downloadgrust-6b5f430a6cfacb79a6332246120dc7699bd2d03c.tar.gz
grust-6b5f430a6cfacb79a6332246120dc7699bd2d03c.tar.bz2
grust-6b5f430a6cfacb79a6332246120dc7699bd2d03c.tar.xz
Revert "Auto merge of #46360 - kennytm:workaround-travis-8821, r=kennytm"
This reverts commit dc0e227745765c198958f0298785d18bcf61d4ae, reversing changes made to 77ab3a1d5ff69c0cb3eb85a75ef734eaf7429f1b. [skip ci]
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml8
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 4ff548c4b8..278d98673d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,8 +25,6 @@ matrix:
25 - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 25 - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
26 if: branch = try OR branch = auto 26 if: branch = try OR branch = auto
27 27
28 # FIXME: The macOS dist images are temporarily disabled until Travis bug is fixed
29 # https://github.com/travis-ci/travis-ci/issues/8821
30 - env: > 28 - env: >
31 RUST_CHECK_TARGET=dist 29 RUST_CHECK_TARGET=dist
32 RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler" 30 RUST_CONFIGURE_ARGS="--enable-extended --enable-profiler"
@@ -39,7 +37,7 @@ matrix:
39 NO_DEBUG_ASSERTIONS=1 37 NO_DEBUG_ASSERTIONS=1
40 os: osx 38 os: osx
41 osx_image: xcode7.3 39 osx_image: xcode7.3
42 if: branch = disabled 40 if: branch = auto
43 41
44 # macOS builders. These are placed near the beginning because they are very 42 # macOS builders. These are placed near the beginning because they are very
45 # slow to run. 43 # slow to run.
@@ -94,7 +92,7 @@ matrix:
94 NO_DEBUG_ASSERTIONS=1 92 NO_DEBUG_ASSERTIONS=1
95 os: osx 93 os: osx
96 osx_image: xcode7.3 94 osx_image: xcode7.3
97 if: branch = disabled 95 if: branch = auto
98 96
99 - env: > 97 - env: >
100 RUST_CHECK_TARGET=dist 98 RUST_CHECK_TARGET=dist
@@ -108,7 +106,7 @@ matrix:
108 NO_DEBUG_ASSERTIONS=1 106 NO_DEBUG_ASSERTIONS=1
109 os: osx 107 os: osx
110 osx_image: xcode7.3 108 osx_image: xcode7.3
111 if: branch = disabled 109 if: branch = auto
112 110
113 # Linux builders, remaining docker images 111 # Linux builders, remaining docker images
114 - env: IMAGE=arm-android 112 - env: IMAGE=arm-android