diff options
| author | Max Kellermann <max@musicpd.org> | 2019-12-23 17:27:40 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2019-12-24 10:20:04 +0100 |
| commit | 3401d26d4c4c5e3a2cdfcce2b0102603fa2a7f74 (patch) | |
| tree | 0504bb95b2f3317eacad36771c5b8cf585e50311 /.travis.yml | |
| parent | 256753ea46141ac4390b88a693cf857ea0a3d431 (diff) | |
.travis.yml: switch to xcode9.4, the current default
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ad4acb8ee..ed28ddbac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ matrix: - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH" - os: osx - osx_image: xcode9.3beta + osx_image: xcode9.4 env: - MATRIX_EVAL="export PATH=/usr/local/opt/ccache/libexec:$PATH HOMEBREW_NO_ANALYTICS=1" @@ -96,6 +96,11 @@ before_install: install: # C++14 + + # Work around "Target /usr/local/lib/libgtest.a is a symlink + # belonging to nss. You can unlink it" during gtest install + - test "$TRAVIS_OS_NAME" != "osx" || brew unlink nss + - test "$TRAVIS_OS_NAME" != "osx" || brew install ccache meson - test "$TRAVIS_OS_NAME" != "osx" || brew install --HEAD https://gist.githubusercontent.com/Kronuz/96ac10fbd8472eb1e7566d740c4034f8/raw/gtest.rb |