Skip to content

Commit

Permalink
Merge pull request #1686 from peternewman/0.10-clang-6.0
Browse files Browse the repository at this point in the history
Switch to clang-11 on Travis
  • Loading branch information
peternewman authored Nov 22, 2020
2 parents 3882b62 + 554c084 commit 2a5ec7f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ addons:
- g++-9
packages: &core_build_clang_latest
- *core_build
- clang-10
- clang-11

matrix:
fast_finish: true
Expand Down Expand Up @@ -99,7 +99,7 @@ matrix:
- *core_build_clang_latest
sources:
- sourceline: "ppa:ubuntu-toolchain-r/test"
- sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main"
- sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-11 main"
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
- os: linux
dist: xenial
Expand Down Expand Up @@ -350,7 +350,7 @@ before_install:
- if [ "$TRAVIS_OS_NAME" == "linux" -a \( "$TASK" = "compile" -o "$TASK" = "coverage" -o "$TASK" = "doxygen" \) -a "$CXX" = "g++" ]; then export CXX="ccache g++-9" CC="ccache gcc-9"; fi
- if [ "$TASK" = "coverity" -a "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi
#Use the latest clang if we're compiling with clang
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-10" CC="clang-10"; fi
- if [ "$TRAVIS_OS_NAME" == "linux" -a "$CXX" = "clang++" ]; then export CXX="clang++-11" CC="clang-11"; fi
#Report the compiler version
- $CXX --version
- if [ "$TASK" == "spellintian" -o "$TASK" == "spellintian-duplicates" ]; then wget "http://old-releases.ubuntu.com/ubuntu/pool/main/l/lintian/lintian_2.5.104_all.deb"; sudo dpkg -i lintian_*.deb; sudo apt-get install -f -y; fi # Install a later lintian
Expand Down

0 comments on commit 2a5ec7f

Please sign in to comment.