From 341aac4cd9dd487f8434b7fc1840036f1223077b Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Sun, 2 May 2021 13:22:49 -0400
Subject: [PATCH] ci: Remove clang-9 entirely from Linux runners

---
 .github/workflows/build.yml   | 7 +++++--
 .github/workflows/release.yml | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5482abbbe..565a8e1d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,6 +38,10 @@ jobs:
             zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
             libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \
             libcurl4-openssl-dev
+          # remove clang-9, some related packages were already removed, causing issues
+          (dpkg -l clang-9 &>/dev/null && sudo apt-get remove --autoremove \
+            clang-9 clang-format-9 libclang-common-9-dev libllvm9 llvm-9{,-dev}) || true
+
           # free up disk space
           # https://github.com/actions/virtual-environments/issues/2840#issuecomment-790492173
           echo Before
@@ -57,8 +61,7 @@ jobs:
         working-directory: ${{github.workspace}}/build
         run: |
           cmake $GITHUB_WORKSPACE -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-            -DCMAKE_C_COMPILER=${{matrix.cc}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}} \
-            -DLLVM_ROOT_DIR=/usr/lib/llvm-10
+            -DCMAKE_C_COMPILER=${{matrix.cc}} -DCMAKE_CXX_COMPILER=${{matrix.cxx}}
 
       - name: Build
         working-directory: ${{github.workspace}}/build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 83bc83a0a..ac0ed7e85 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,6 +40,9 @@ jobs:
             zlib1g-dev libglu1-mesa-dev libdbus-1-dev libvulkan-dev libxi-dev libxrandr-dev libasound2-dev \
             libpulse-dev libudev-dev libpng-dev libncurses5-dev libx11-xcb-dev python3 python-is-python3 qt5-default \
             libcurl4-openssl-dev intel-oneapi-ipp-devel
+          # remove clang-9, some related packages were already removed, causing issues
+          (dpkg -l clang-9 &>/dev/null && sudo apt-get remove --autoremove \
+            clang-9 clang-format-9 libclang-common-9-dev libllvm9 llvm-9{,-dev}) || true
 
           yarn global add @sentry/cli
           echo "$(yarn global bin)" >> $GITHUB_PATH