From 78f6f23a0e450108e891b9031fdcd1076fd27155 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 21 Nov 2020 04:15:12 +0000 Subject: [PATCH 1/3] Switch to clang-11 on Travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce5a5b7fd9..ad8504a1ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ addons: - g++-9 packages: &core_build_clang_latest - *core_build - - clang-10 + - clang-11 matrix: fast_finish: true @@ -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++-10" 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 From ac950ccefc2b53569f47771548114057bafccac1 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 21 Nov 2020 09:59:13 +0000 Subject: [PATCH 2/3] Update the clang sourceline for the correct repo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad8504a1ee..5e85788225 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 554c0845d1e842fd104ffd023e43961be483d4f2 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 21 Nov 2020 20:15:02 +0000 Subject: [PATCH 3/3] Hopefully catch ALL the clang version changes! --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e85788225..9fab50d8cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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-11"; 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