From 9d4c888f8f7d1ece4e4d14032de4396ead35ac2a Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 13 Aug 2021 11:15:56 +1000
Subject: [PATCH] Try using more recent clang tools

---
 .github/workflows/clang_static_analyzer.yml      | 2 +-
 .github/workflows/clang_static_analyzer/start.sh | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/clang_static_analyzer.yml b/.github/workflows/clang_static_analyzer.yml
index 9751fec..4ed03df 100644
--- a/.github/workflows/clang_static_analyzer.yml
+++ b/.github/workflows/clang_static_analyzer.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
 
   clang_static_analyzer:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - name: Checkout
diff --git a/.github/workflows/clang_static_analyzer/start.sh b/.github/workflows/clang_static_analyzer/start.sh
index 2537c16..33419b9 100755
--- a/.github/workflows/clang_static_analyzer/start.sh
+++ b/.github/workflows/clang_static_analyzer/start.sh
@@ -5,14 +5,7 @@ set -e
 sudo apt update
 
 DEBIAN_FRONTEND=noninteractive sudo apt-get install -y --no-install-recommends \
-    autoconf automake libtool g++ make jq
-
-CLANG_LLVM=clang+llvm-9.0.0-x86_64-linux-gnu-ubuntu-18.04
-wget -nv https://releases.llvm.org/9.0.0/$CLANG_LLVM.tar.xz
-tar xJf $CLANG_LLVM.tar.xz
-mv $CLANG_LLVM clang+llvm-9
-
-export PATH=$PWD/clang+llvm-9/bin:$PATH
+    libtool g++ make jq clang-tools
 
 # prepare build files
 mkdir -p build