Skip to content

Commit

Permalink
Use XCode 9.2 on Travis CI for macOS builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
briansmith committed Dec 23, 2017
1 parent afeea5e commit f154115
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ matrix:
- env: TARGET_X=x86_64-apple-darwin FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: stable
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X= MODE_X=DEBUG KCOV=0
rust: stable
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: stable
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: stable
Expand Down Expand Up @@ -568,22 +568,22 @@ matrix:
- env: TARGET_X=x86_64-apple-darwin FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: nightly
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X= MODE_X=DEBUG KCOV=0
rust: nightly
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: nightly
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: nightly
Expand Down Expand Up @@ -1136,22 +1136,22 @@ matrix:
- env: TARGET_X=x86_64-apple-darwin FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: beta
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X= MODE_X=DEBUG KCOV=0
rust: beta
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X=--features=rsa_signing MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=x86_64-apple-darwin FEATURES_X= MODE_X=RELWITHDEBINFO KCOV=0
rust: beta
os: osx
osx_image: xcode8.2
osx_image: xcode9.2

- env: TARGET_X=armv7-linux-androideabi CC_X=arm-linux-androideabi-gcc CXX_X=arm-linux-androideabi-g++ FEATURES_X=--features=rsa_signing MODE_X=DEBUG KCOV=0
rust: beta
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ the table below. The C compilers listed are used for compiling the C portions.
</tr>
<tr><td>Mac&nbsp;OS&nbsp;X</td>
<td>x64</td>
<td>Apple LLVM version 8.0.0 (clang-800.0.42.1) from Xcode 8.2</td>
<td>Apple LLVM version 9.0.0 (clang-900.0.39.2) from Xcode 9.2</td>
</tr>
<tr><td>Windows</td>
<td>x86, x86_64</td>
Expand Down
2 changes: 1 addition & 1 deletion mk/update-travis-yml.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def prefix_all(prefix, xs):
cxx = replace_cc_with_cxx(sys, compiler)

if os == "osx":
os += "\n" + entry_indent + "osx_image: xcode8.2"
os += "\n" + entry_indent + "osx_image: xcode9.2"

compilers = []
if cc != "":
Expand Down

0 comments on commit f154115

Please sign in to comment.