summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Costan <costan@google.com>2021-05-25 02:17:44 +0000
committerVictor Costan <costan@google.com>2021-05-25 02:20:52 +0000
commitb638ebe5d95ec4559921a72f8c2bbc4b1b5a2fd0 (patch)
treeb405ccb2d19c2e91afd7ae1fb5c243fc7113a7a7
parentd8f5dd8ecab790529ee665f4f8a784e9b1b3f687 (diff)
downloadsnappy-git-b638ebe5d95ec4559921a72f8c2bbc4b1b5a2fd0.tar.gz
Update Travis CI config.
Xcode (drives macOS image) : 12.2 => 12.5 Clang : 10 => 12 GCC : 10 => 11 PiperOrigin-RevId: 375610083
-rw-r--r--.travis.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index 975899a..2213d65 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
@@ -35,20 +35,20 @@ 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
- ninja-build
homebrew:
packages:
- cmake
- - gcc@10
- - llvm@10
+ - gcc@11
+ - llvm@12
- ninja
update: true
@@ -66,14 +66,14 @@ install:
export FUZZING=0;
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}