Skip to content

Commit db08d22

Browse files
authored
Updated Travis-CI configuration. (google#51)
clang/llvm: 10 → 12 gcc: 10 → 11
1 parent e31619a commit db08d22

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
language: cpp
66
dist: bionic
7-
osx_image: xcode12.2
7+
osx_image: xcode12.5
88

99
compiler:
1010
- gcc
@@ -24,20 +24,20 @@ env:
2424
addons:
2525
apt:
2626
sources:
27-
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main'
27+
- sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-12 main'
2828
key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
2929
- sourceline: 'ppa:ubuntu-toolchain-r/test'
3030
packages:
31-
- clang-10
31+
- clang-12
3232
- cmake
33-
- gcc-10
34-
- g++-10
33+
- gcc-11
34+
- g++-11
3535
- ninja-build
3636
homebrew:
3737
packages:
3838
- cmake
39-
- gcc@10
40-
- llvm@10
39+
- gcc@11
40+
- llvm@12
4141
- ninja
4242
update: true
4343

@@ -48,14 +48,14 @@ install:
4848
export PATH="$(brew --prefix llvm)/bin:$PATH";
4949
fi
5050
# /usr/bin/gcc points to an older compiler on both Linux and macOS.
51-
- if [ "$CXX" = "g++" ]; then export CXX="g++-10" CC="gcc-10"; fi
51+
- if [ "$CXX" = "g++" ]; then export CXX="g++-11" CC="gcc-11"; fi
5252
# /usr/bin/clang points to an older compiler on both Linux and macOS.
5353
#
5454
# Homebrew's llvm package doesn't ship a versioned clang++ binary, so the values
5555
# below don't work on macOS. Fortunately, the path change above makes the
5656
# default values (clang and clang++) resolve to the correct compiler on macOS.
5757
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
58-
if [ "$CXX" = "clang++" ]; then export CXX="clang++-10" CC="clang-10"; fi;
58+
if [ "$CXX" = "clang++" ]; then export CXX="clang++-12" CC="clang-12"; fi;
5959
fi
6060
- echo ${CC}
6161
- echo ${CXX}

0 commit comments

Comments
 (0)