From 0aebdcd5401d93df9107a8a6a2985b503bb85b69 Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Mon, 30 Oct 2023 23:25:00 +0100 Subject: [PATCH 1/2] CI: upgrade Sonar GitHub Action to v2 Avoiding Java 11 phase-out with it. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 006ef9223..054f633ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -144,7 +144,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: | From ffb87076ffb6384ec3d8117ccda3a1db9db59937 Mon Sep 17 00:00:00 2001 From: Alexey Rusakov Date: Tue, 31 Oct 2023 00:21:29 +0100 Subject: [PATCH 2/2] CI: Work around broken Clang+libstdc++ combination To be removed once https://github.com/actions/runner-images/issues/8659 gets fixed. --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 054f633ad..9325cc4b0 100644 --- 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')