Skip to content

Commit

Permalink
Updated Travis-CI configuration. (google#51)
Browse files Browse the repository at this point in the history
clang/llvm: 10 → 12
gcc: 10 → 11
  • Loading branch information
cmumford authored Jun 20, 2021
1 parent e31619a commit db08d22
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

language: cpp
dist: bionic
osx_image: xcode12.2
osx_image: xcode12.5

compiler:
- gcc
Expand All @@ -24,20 +24,20 @@ env:
addons:
apt:
sources:
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 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

Expand All @@ -48,14 +48,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}
Expand Down

0 comments on commit db08d22

Please sign in to comment.