summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Costan <costan@google.com>2021-05-24 23:28:59 +0000
committerVictor Costan <costan@google.com>2021-05-25 01:40:12 +0000
commit5d94ad4d95c09d3ac203ddaf9922e55e730706a8 (patch)
tree05f7f177181aafcb93f7dbd5f9fcc552ed0af05f
parentc7a0fa28a41fba536cfab038ca1170046a2a6098 (diff)
downloadleveldb-5d94ad4d95c09d3ac203ddaf9922e55e730706a8.tar.gz
Update Travis CI config.
Xcode (drives macOS image) : 12.2 => 12.5 Clang : 10 => 12 GCC : 10 => 11 PiperOrigin-RevId: 375582717
-rw-r--r--.travis.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index e34a67e..ad59b19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
language: cpp
dist: bionic
-osx_image: xcode12.2
+osx_image: xcode12.5
compiler:
- gcc
@@ -26,14 +26,14 @@ jobs:
addons:
apt:
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'
- sourceline: 'ppa:ubuntu-toolchain-r/test'
packages:
- - clang-10
+ - clang-12
- cmake
- - gcc-10
- - g++-10
+ - gcc-11
+ - g++-11
- libgoogle-perftools-dev
- libkyotocabinet-dev
- libsnappy-dev
@@ -43,10 +43,10 @@ addons:
packages:
- cmake
- crc32c
- - gcc@10
+ - gcc@11
- gperftools
- kyoto-cabinet
- - llvm@10
+ - llvm@12
- ninja
- snappy
- sqlite3
@@ -59,14 +59,14 @@ install:
export PATH="$(brew --prefix llvm)/bin:$PATH";
fi
# /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.
#
# 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
# 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++-10" CC="clang-10"; fi;
+ if [ "$CXX" = "clang++" ]; then export CXX="clang++-12" CC="clang-12"; fi;
fi
- echo ${CC}
- echo ${CXX}