Use LLVM 10 on Travis CI.
PiperOrigin-RevId: 306236199
This commit is contained in:
parent
5903e7a112
commit
ba369ddbaf
@ -20,11 +20,11 @@ env:
|
|||||||
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
|
||||||
@ -40,7 +40,7 @@ addons:
|
|||||||
- gcc@9
|
- gcc@9
|
||||||
- gperftools
|
- gperftools
|
||||||
- kyoto-cabinet
|
- kyoto-cabinet
|
||||||
- llvm@9
|
- llvm@10
|
||||||
- ninja
|
- ninja
|
||||||
- snappy
|
- snappy
|
||||||
- sqlite3
|
- sqlite3
|
||||||
@ -60,7 +60,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}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user