Update Travis CI config.

PiperOrigin-RevId: 347391876
This commit is contained in:
Victor Costan 2020-12-14 08:34:41 -08:00 committed by Chris Mumford
parent 295ce1336f
commit 6721eda0b4

View File

@ -4,7 +4,7 @@
language: cpp language: cpp
dist: bionic dist: bionic
osx_image: xcode11.3 osx_image: xcode12.2
compiler: compiler:
- gcc - gcc
@ -32,8 +32,8 @@ addons:
packages: packages:
- clang-10 - clang-10
- cmake - cmake
- gcc-9 - gcc-10
- g++-9 - g++-10
- libgoogle-perftools-dev - libgoogle-perftools-dev
- libkyotocabinet-dev - libkyotocabinet-dev
- libsnappy-dev - libsnappy-dev
@ -43,7 +43,7 @@ addons:
packages: packages:
- cmake - cmake
- crc32c - crc32c
- gcc@9 - gcc@10
- gperftools - gperftools
- kyoto-cabinet - kyoto-cabinet
- llvm@10 - llvm@10
@ -59,7 +59,7 @@ install:
export PATH="$(brew --prefix llvm)/bin:$PATH"; export PATH="$(brew --prefix llvm)/bin:$PATH";
fi fi
# /usr/bin/gcc points to an older compiler on both Linux and macOS. # /usr/bin/gcc points to an older compiler on both Linux and macOS.
- if [ "$CXX" = "g++" ]; then export CXX="g++-9" CC="gcc-9"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi
# /usr/bin/clang points to an older compiler on both Linux and macOS. # /usr/bin/clang points to an older compiler on both Linux and macOS.
# #
# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values # Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values