Fix Travis CI build.

PiperOrigin-RevId: 309143110
This commit is contained in:
Victor Costan
2020-04-30 02:00:33 +00:00
parent e6506681fa
commit abde3abb1f

View File

@@ -4,7 +4,7 @@
language: cpp language: cpp
dist: bionic dist: bionic
osx_image: xcode10.3 osx_image: xcode11.3
compiler: compiler:
- gcc - gcc
@@ -19,7 +19,7 @@ env:
- BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX - BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX
- BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2 - BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2
matrix: jobs:
exclude: exclude:
# Travis OSX servers seem to run on pre-Haswell CPUs. Attempting to use AVX2 # Travis OSX servers seem to run on pre-Haswell CPUs. Attempting to use AVX2
# results in crashes. # results in crashes.
@@ -27,15 +27,19 @@ matrix:
os: osx os: osx
- env: BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2 - env: BUILD_TYPE=RelWithDebInfo CPU_LEVEL=AVX2
os: osx os: osx
allow_failures:
# Homebrew's GCC is currently broken on XCode 11.
- compiler: gcc
os: osx
addons: addons:
apt: apt:
sources: 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' key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- sourceline: 'ppa:ubuntu-toolchain-r/test' - sourceline: 'ppa:ubuntu-toolchain-r/test'
packages: packages:
- clang-9 - clang-10
- cmake - cmake
- gcc-9 - gcc-9
- g++-9 - g++-9
@@ -44,7 +48,7 @@ addons:
packages: packages:
- cmake - cmake
- gcc@9 - gcc@9
- llvm@9 - llvm@10
- ninja - ninja
update: true update: true
@@ -68,7 +72,7 @@ install:
# below don't work on macOS. Fortunately, the path change above makes the # 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. # default values (clang and clang++) resolve to the correct compiler on macOS.
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then - 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 fi
- echo ${CC} - echo ${CC}
- echo ${CXX} - echo ${CXX}