From 3135f6b50370de3c8b7e95517c79f0ec19df7265 Mon Sep 17 00:00:00 2001
From: Simon Giesecke <sgiesecke@mozilla.com>
Date: Fri, 19 Jun 2020 17:25:58 +0200
Subject: [PATCH] Problem: clang-tidy job is failing because package
 dependencies are outdated

Solution: update to llvm-toolchain-10
---
 .travis.yml              | 10 +++++-----
 builds/cmake/ci_build.sh |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cfe457a1..47926f18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,18 +29,18 @@ env:
 matrix:
   include:
   - if: type = cron OR (branch =~ analyze$ AND type = push)
-    env: BUILD_TYPE=cmake CLANG_TIDY=/usr/bin/clang-tidy-8 CC=clang-8 CXX=clang++-8
+    env: BUILD_TYPE=cmake CLANG_TIDY=/usr/bin/clang-tidy-10 CC=clang-10 CXX=clang++-10
     os: linux
     compiler: clang
     addons:
       apt:
         sources:
           - ubuntu-toolchain-r-test
-          - llvm-toolchain-trusty-8
+          - llvm-toolchain-10
         packages:
-          - clang-8
-          - clang-tools-8
-          - clang-tidy-8
+          - clang-10
+          - clang-tools-10
+          - clang-tidy-10
   - env: BUILD_TYPE=default CURVE=tweetnacl IPv6=ON
     os: linux
     dist: precise
diff --git a/builds/cmake/ci_build.sh b/builds/cmake/ci_build.sh
index 009202ee..dea9756a 100755
--- a/builds/cmake/ci_build.sh
+++ b/builds/cmake/ci_build.sh
@@ -60,8 +60,8 @@ if [ -n "$CLANG_TIDY" ] ; then
         MAKE_PREFIXES+=("${TRAVIS_BUILD_DIR}/bw-output")
         
     fi
-    CMAKE_PREFIXES+=("scan-build-8")
-    MAKE_PREFIXES+=("scan-build-8")
+    CMAKE_PREFIXES+=("scan-build-10")
+    MAKE_PREFIXES+=("scan-build-10")
     MAKE_PREFIXES+=("-plist-html")
     SCAN_BUILD_OUTPUT="$(pwd)/scan-build-report"
     MAKE_PREFIXES+=("-o ${SCAN_BUILD_OUTPUT}")