Update scanbuild job to clang 9

klassenjs · Feb 21, 2020 · 7ad488a · 7ad488a
1 parent 3770e50
commit 7ad488a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -110,8 +110,11 @@ matrix:
           - $HOME/.ccache
       addons:
         apt:
-          sources: *sources
-          packages: ['clang','ccache','doxygen']
+          sources:
+            - ubuntu-toolchain-r-test
+            - sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+          packages: ['clang-9', 'clang-tools-9', 'ccache','doxygen']
       env:
         - E="TOOL=autotools_scanbuild && BUILD_TYPE=Release && ARCH=-m64"
 

diff --git a/tools/ci/script_autotools_scanbuild.sh b/tools/ci/script_autotools_scanbuild.sh
@@ -21,5 +21,5 @@ fi
 cd ${TRAVIS_BUILD_DIR}
 ./autogen.sh
 cd -
-${TRAVIS_BUILD_DIR}/configure CC=clang CXX=clang++ CXXFLAGS="-std=c++11"
-scan-build --status-bugs make -j2
+scan-build ${TRAVIS_BUILD_DIR}/configure CC=clang-9 CXX=clang++-9 CXXFLAGS="-std=c++11"
+scan-build --keep-cc --status-bugs make -j2