tqcq/leveldb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Travis CI config.

Browse Source 
Xcode (drives macOS image) : 12.2 => 12.5
Clang                      : 10 => 12
GCC                        : 10 => 11
PiperOrigin-RevId: 375582717
This commit is contained in:
Victor Costan 2021-05-24 23:28:59 +00:00
parent c7a0fa28a4
commit 5d94ad4d95
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -4,7 +4,7 @@
language: cpp language: cpp
dist: bionic dist: bionic
osx_image: xcode12.2 osx_image: xcode12.5
compiler: compiler:
- gcc - gcc
@ -26,14 +26,14 @@ jobs:
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-10 main' - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 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-10 - clang-12
- cmake - cmake
- gcc-10 - gcc-11
- g++-10 - g++-11
- libgoogle-perftools-dev - libgoogle-perftools-dev
- libkyotocabinet-dev - libkyotocabinet-dev
- libsnappy-dev - libsnappy-dev
@ -43,10 +43,10 @@ addons:
packages: packages:
- cmake - cmake
- crc32c - crc32c
- gcc@10 - gcc@11
- gperftools - gperftools
- kyoto-cabinet - kyoto-cabinet
- llvm@10 - llvm@12
- ninja - ninja
- snappy - snappy
- sqlite3 - sqlite3
@ -59,14 +59,14 @@ 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++-10" CC="gcc-10"; fi - if [ "$CXX" = "g++" ]; then export CXX="g++-11" CC="gcc-11"; 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
# 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++-10" CC="clang-10"; fi; if [ "$CXX" = "clang++" ]; then export CXX="clang++-12" CC="clang-12"; fi;
fi fi
- echo ${CC} - echo ${CC}
- echo ${CXX} - echo ${CXX}