From 5bf7ec5b4b0fb82caeddaff4daf30311248b58c4 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <>
Date: Fri, 16 Feb 2024 17:36:45 +0100
Subject: [PATCH] Go for clang-15 to work around GH's Clang SNAFU

See https://github.com/actions/runner-images/issues/8659
---
 .github/workflows/ci.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48665de98..702afb1bd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,8 +62,9 @@ jobs:
       run: |
         COMMON_PKGS="libolm-dev ninja-build valgrind gnome-keyring"
         # Workaround for https://github.com/actions/runner-images/issues/8659
-        sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
-        COMMON_PKGS="--allow-downgrades libc6=2.35-0ubuntu3.5 libc6-dev=2.35-0ubuntu3.5 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04 $COMMON_PKGS"
+        COMMON_PKGS="$COMMON_PKGS clang-15"
+        #sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
+        #COMMON_PKGS="--allow-downgrades libc6=2.35-0ubuntu3.5 libc6-dev=2.35-0ubuntu3.5 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04 $COMMON_PKGS"
         # End of workaround
         sudo apt-get -qq update
         sudo apt-get -qq install $COMMON_PKGS \
@@ -88,9 +89,9 @@ jobs:
             echo "CC=gcc" >>$GITHUB_ENV
             echo "CXX=g++" >>$GITHUB_ENV
             echo "VALGRIND=valgrind --tool=memcheck --leak-check=yes --gen-suppressions=all --suppressions=$GITHUB_WORKSPACE/quotest/.valgrind.supp" >>$GITHUB_ENV
-        elif [[ '${{ runner.os }}' != 'Windows' ]]; then
-            echo "CC=clang" >>$GITHUB_ENV
-            echo "CXX=clang++" >>$GITHUB_ENV
+        elif [[ '${{ runner.os }}' == 'Linux' ]]; then
+            echo "CC=clang-15" >>$GITHUB_ENV
+            echo "CXX=clang++-15" >>$GITHUB_ENV
         fi
         if grep -q 'refs/tags' <<<'${{ github.ref }}'; then
             VERSION="$(git describe --tags)"