summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-08-31 13:54:49 +0800
committerkennytm <kennytm@gmail.com>2018-09-04 00:43:12 +0800
commitb24543262d255e84abe5f36c31789eaffdebf16d (patch)
treee277ea72e21b783df8a5660be65638f16bece211
parentfea32f1b775b3f37fc4abfa6391c1bebe48af9d1 (diff)
downloadrust-xcode9.4.tar.gz
CI: Try to switch to xcode9.4 & 10.xcode9.4
-rw-r--r--.travis.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 4a7c8f4b7cf..4b1e0355f6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ matrix:
NO_DEBUG_ASSERTIONS=1
CI_JOB_NAME=dist-x86_64-apple-alt
os: osx
- osx_image: xcode9.3-moar
+ osx_image: xcode10
if: branch = auto
# macOS builders. These are placed near the beginning because they are very
@@ -62,7 +62,7 @@ matrix:
NO_DEBUG_ASSERTIONS=1
CI_JOB_NAME=x86_64-apple
os: osx
- osx_image: xcode9.3-moar
+ osx_image: xcode10
if: branch = auto
- env: >
@@ -76,8 +76,8 @@ matrix:
NO_DEBUG_ASSERTIONS=1
CI_JOB_NAME=i686-apple
os: osx
- osx_image: xcode9.3-moar
- if: branch = auto
+ osx_image: xcode9.4
+ if: branch = auto OR branch = xcode9.4
# OSX builders producing releases. These do not run the full test suite and
# just produce a bunch of artifacts.
@@ -96,8 +96,8 @@ matrix:
NO_DEBUG_ASSERTIONS=1
CI_JOB_NAME=dist-i686-apple
os: osx
- osx_image: xcode9.3-moar
- if: branch = auto
+ osx_image: xcode9.4
+ if: branch = auto OR branch = xcode9.4
- env: >
RUST_CHECK_TARGET=dist
@@ -110,8 +110,8 @@ matrix:
NO_DEBUG_ASSERTIONS=1
CI_JOB_NAME=dist-x86_64-apple
os: osx
- osx_image: xcode9.3-moar
- if: branch = auto
+ osx_image: xcode10
+ if: branch = auto OR branch = xcode9.4
# Linux builders, remaining docker images
- env: IMAGE=arm-android