From 22bb7298931ebb23405f13048cb5b8072bdf43b9 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 8 Jan 2025 12:00:36 +0100 Subject: [PATCH] [ci,workflows] allow libwebkit2gtk-4.0-dev | libwebkit2gtk-4.1-dev --- .github/workflows/abi-checker.yml | 2 +- .github/workflows/alt-architectures.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/abi-checker.yml b/.github/workflows/abi-checker.yml index 933bfd4d7..806d65cbc 100644 --- a/.github/workflows/abi-checker.yml +++ b/.github/workflows/abi-checker.yml @@ -68,7 +68,6 @@ jobs: libkrb5-dev \ libcjson-dev \ libsdl2-ttf-dev \ - libwebkit2gtk-4.0-dev \ libopus-dev \ libwebp-dev \ libpng-dev \ @@ -80,6 +79,7 @@ jobs: abigail-tools \ pylint \ curl + sudo apt-get satisfy -q -y "libwebkit2gtk-4.0-dev | libwebkit2gtk-4.1-dev" - name: "Prepare configuration" run: | diff --git a/.github/workflows/alt-architectures.yml b/.github/workflows/alt-architectures.yml index aafcb6741..91d43922e 100644 --- a/.github/workflows/alt-architectures.yml +++ b/.github/workflows/alt-architectures.yml @@ -75,7 +75,6 @@ jobs: libkrb5-dev \ libcjson-dev \ libpkcs11-helper1-dev \ - libwebkit2gtk-4.0-dev \ libopus-dev \ libwebp-dev \ libpng-dev \ @@ -86,6 +85,7 @@ jobs: libv4l-dev \ cmake \ clang + sudo apt-get satisfy -q -y "libwebkit2gtk-4.0-dev | libwebkit2gtk-4.1-dev" run: | cmake -GNinja \ -C ci/cmake-preloads/config-linux-all.txt \ diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 13648d032..7659a36f7 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -119,13 +119,13 @@ jobs: libcjson-dev \ libsdl2-ttf-dev \ libsdl2-image-dev \ - libwebkit2gtk-4.0-dev \ clang \ libopus-dev \ libwebp-dev \ libpng-dev \ libjpeg-dev \ liburiparser-dev + sudo apt-get satisfy -q -y "libwebkit2gtk-4.0-dev | libwebkit2gtk-4.1-dev" mkdir ci-build cd ci-build export CC=/usr/bin/clang