From 9a01833d904af14c21a0f2455af5126a66280d55 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sun, 18 Apr 2021 22:08:53 -0400
Subject: ci(gha): Simplify clang installation

---
 .github/workflows/ci.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9ea8f77563..e7a8625378 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,12 +38,6 @@ jobs:
       - name: Setup commom environment variables
         run: ./.github/workflows/env.sh ${{ matrix.flavor }}
 
-      - name: Setup clang repository
-        if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
-        run: |
-          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-          sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main'
-
       - name: Install apt packages
         if: matrix.os == 'linux'
         run: |
@@ -52,7 +46,11 @@ jobs:
 
       - name: Install new clang
         if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
-        run: sudo apt-get install -y clang-12
+        run: |
+          wget https://apt.llvm.org/llvm.sh
+          chmod a+x llvm.sh
+          sudo ./llvm.sh 12
+          rm llvm.sh
 
       - name: Install brew packages
         if: matrix.os == 'osx'
-- 
cgit