Skip to content

Commit 361cf44

Browse files
committed
travis: Compile OSX releases with Xcode 7
Unfortunately what we're using right now, Xcode 8.2, cannot compile LLVM for OSX 10.7. We've done this historically and Gecko would like to maintain this compabitiliby. This commit moves our release builders for OSX to using Xcode 7 which can compile LLVM for 10.7. The builders running tests continue to use Xcode 8.2, however, because the LLDB version with Xcode 7, 350, is blacklisted in running our LLDB tests. To continue running LLDB tests we'll stick with Xcode 8.2.
1 parent bf403d0 commit 361cf44

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

.travis.yml

+16-10
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ matrix:
4040
- env: IMAGE=x86_64-gnu-distcheck
4141
- env: IMAGE=x86_64-gnu-incremental
4242

43-
# OSX builders
43+
# OSX builders running tests, these run the full test suite.
44+
#
45+
# Note that the compiler is compiled to target 10.8 here because the Xcode
46+
# version that we're using, 8.2, cannot compile LLVM for OSX 10.7.
4447
- env: >
4548
RUST_CHECK_TARGET=check
4649
RUST_CONFIGURE_ARGS=--build=x86_64-apple-darwin
@@ -68,6 +71,12 @@ matrix:
6871
osx_image: xcode8.2
6972
install: *osx_install_sccache
7073
74+
# OSX builders producing releases. These do not run the full test suite and
75+
# just produce a bunch of artifacts.
76+
#
77+
# Note that these are running in the `xcode7` image instead of the
78+
# `xcode8.2` image as above. That's because we want to build releases for
79+
# OSX 10.7 and `xcode7` is the latest Xcode able to compile LLVM for 10.7.
7180
- env: >
7281
RUST_CHECK_TARGET=dist
7382
RUST_CONFIGURE_ARGS="--build=i686-apple-darwin --enable-extended"
@@ -76,10 +85,9 @@ matrix:
7685
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
7786
SCCACHE_ERROR_LOG=/tmp/sccache.log
7887
RUST_LOG=sccache=debug
79-
MACOSX_DEPLOYMENT_TARGET=10.8
80-
MACOSX_STD_DEPLOYMENT_TARGET=10.7
88+
MACOSX_DEPLOYMENT_TARGET=10.7
8189
os: osx
82-
osx_image: xcode8.2
90+
osx_image: xcode7
8391
install: >
8492
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-25-sccache-x86_64-apple-darwin &&
8593
chmod +x /usr/local/bin/sccache
@@ -91,10 +99,9 @@ matrix:
9199
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
92100
SCCACHE_ERROR_LOG=/tmp/sccache.log
93101
RUST_LOG=sccache=debug
94-
MACOSX_DEPLOYMENT_TARGET=10.8
95-
MACOSX_STD_DEPLOYMENT_TARGET=10.7
102+
MACOSX_DEPLOYMENT_TARGET=10.7
96103
os: osx
97-
osx_image: xcode8.2
104+
osx_image: xcode7
98105
install: *osx_install_sccache
99106
100107
# "alternate" deployments, these are "nightlies" but don't have assertions
@@ -110,10 +117,9 @@ matrix:
110117
RUSTC_RETRY_LINKER_ON_SEGFAULT=1
111118
SCCACHE_ERROR_LOG=/tmp/sccache.log
112119
RUST_LOG=sccache=debug
113-
MACOSX_DEPLOYMENT_TARGET=10.8
114-
MACOSX_STD_DEPLOYMENT_TARGET=10.7
120+
MACOSX_DEPLOYMENT_TARGET=10.7
115121
os: osx
116-
osx_image: xcode8.2
122+
osx_image: xcode7
117123
install: *osx_install_sccache
118124
119125
env:

0 commit comments

Comments
 (0)