Skip to content

Commit 8c603ad

Browse files
authored
Merge #712(kitsune): More CI fixes
2 parents 5af4e78 + ffb8707 commit 8c603ad

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/ci.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ jobs:
6161
if: startsWith(matrix.os, 'ubuntu')
6262
run: |
6363
COMMON_PKGS="libolm-dev ninja-build valgrind gnome-keyring"
64+
# Workaround for https://github.com/actions/runner-images/issues/8659
65+
sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
66+
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"
67+
# End of workaround
6468
sudo apt-get -qq update
6569
sudo apt-get -qq install $COMMON_PKGS \
6670
${{ startsWith(matrix.qt-version, '5')
@@ -144,7 +148,7 @@ jobs:
144148
- name: Set up Sonar Cloud tools
145149
id: sonar
146150
if: matrix.static-analysis == 'sonar'
147-
uses: sonarsource/sonarcloud-github-c-cpp@v1
151+
uses: sonarsource/sonarcloud-github-c-cpp@v2
148152

149153
- name: Build and install QtKeychain
150154
run: |

0 commit comments

Comments
 (0)