diff options
| author | Victor Costan <costan@google.com> | 2020-04-30 02:00:33 +0000 |
|---|---|---|
| committer | Victor Costan <costan@google.com> | 2020-04-30 02:09:07 +0000 |
| commit | abde3abb1f4b17ac554a81b5ce133107b4830d02 (patch) | |
| tree | 328bbcc36fdec01da809b3397d33bab68f963a28 | |
| parent | e6506681fa644c9f7149e9b58a2ee3b7336b0b22 (diff) | |
| download | snappy-git-abde3abb1f4b17ac554a81b5ce133107b4830d02.tar.gz | |
Fix Travis CI build.
PiperOrigin-RevId: 309143110
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 896147c..395f52e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp dist: bionic -osx_image: xcode10.3 +osx_image: xcode11.3 compiler: - gcc @@ -19,7 +19,7 @@ env: - BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX - BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2 -matrix: +jobs: exclude: # Travis OSX servers seem to run on pre-Haswell CPUs. Attempting to use AVX2 # results in crashes. @@ -27,15 +27,19 @@ matrix: os: osx - env: BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2 os: osx + allow_failures: + # Homebrew's GCC is currently broken on XCode 11. + - compiler: gcc + os: osx addons: apt: sources: - - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main' + - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main' key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key' - sourceline: 'ppa:ubuntu-toolchain-r/test' packages: - - clang-9 + - clang-10 - cmake - gcc-9 - g++-9 @@ -44,7 +48,7 @@ addons: packages: - cmake - gcc@9 - - llvm@9 + - llvm@10 - ninja update: true @@ -68,7 +72,7 @@ install: # below don't work on macOS. Fortunately, the path change above makes the # default values (clang and clang++) resolve to the correct compiler on macOS. - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$CXX" = "clang++" ]; then export CXX="clang++-9" CC="clang-9"; fi; + if [ "$CXX" = "clang++" ]; then export CXX="clang++-10" CC="clang-10"; fi; fi - echo ${CC} - echo ${CXX} |