Merge #712(kitsune): More CI fixes

quotient-im · Oct 31, 2023 · 8c603ad · 8c603ad
2 parents 5af4e78 + ffb8707
commit 8c603ad
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,6 +61,10 @@ jobs:
       if: startsWith(matrix.os, 'ubuntu')
       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.4 libc6-dev=2.35-0ubuntu3.4 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 \
             ${{ startsWith(matrix.qt-version, '5')
@@ -144,7 +148,7 @@ jobs:
     - name: Set up Sonar Cloud tools
       id: sonar
       if: matrix.static-analysis == 'sonar'
-      uses: sonarsource/sonarcloud-github-c-cpp@v1
+      uses: sonarsource/sonarcloud-github-c-cpp@v2
 
     - name: Build and install QtKeychain
       run: |