diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-19 15:49:33 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-20 08:35:47 -0800 |
| commit | dd5d85ea761e2d570682fccdb8608319d6bd2bf4 (patch) | |
| tree | 778f17451f1b0ab67da945f52d20ebf9e6ca1fd9 | |
| parent | 86605c405454c61c2cc202a6f9beed3e3b27fa55 (diff) | |
| parent | baff51c0402c2f80cf48ab677ed00894683dde14 (diff) | |
| download | rust-dd5d85ea761e2d570682fccdb8608319d6bd2bf4.tar.gz rust-dd5d85ea761e2d570682fccdb8608319d6bd2bf4.zip | |
Rollup merge of #39114 - alexcrichton:fix-osx-image, r=brson
travis: Tweak OSX image configuration Somewhere between https://travis-ci.org/rust-lang/rust/jobs/192352185 and https://travis-ci.org/rust-lang/rust/jobs/192440181 it looks like our configuration for a newer OSX image was lost as LLDB has reverted itself back to 350. This fix appeared to work for the libc crate so let's see if we can configure it to work for the rust repo as well.
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index f38026857c0..ec56872698c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ git: depth: 1 submodules: false -osx_image: xcode8.2 - matrix: include: # Linux builders, all docker images @@ -41,6 +39,7 @@ matrix: RUST_CONFIGURE_ARGS=--build=x86_64-apple-darwin SRC=. os: osx + osx_image: xcode8.2 before_script: &osx_before_script > ulimit -c unlimited install: &osx_install_sccache > @@ -59,6 +58,7 @@ matrix: SRC=. DEPLOY=1 os: osx + osx_image: xcode8.2 before_script: *osx_before_script install: *osx_install_sccache after_failure: *osx_after_failure @@ -67,6 +67,7 @@ matrix: RUST_CONFIGURE_ARGS=--build=x86_64-apple-darwin --disable-rustbuild SRC=. os: osx + osx_image: xcode8.2 before_script: *osx_before_script install: *osx_install_sccache after_failure: *osx_after_failure @@ -76,6 +77,7 @@ matrix: SRC=. DEPLOY=1 os: osx + osx_image: xcode8.2 before_script: *osx_before_script install: *osx_install_sccache after_failure: *osx_after_failure |