From 30967a5e14c6e2e92529e4ab31f8fb9836ad27d7 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Mon, 30 Dec 2024 20:38:57 +0100 Subject: [PATCH 1/2] Explicitly set Qt version to compile against --- .github/workflows/ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cad5ee68b..148ad3669 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,12 +63,15 @@ jobs: - target: jammy-qt5 image_variant: jammy lib_postfix: '/x86_64-linux-gnu' + qt_version: 5 - target: noble-qt6.4 image_variant: noble lib_postfix: '/x86_64-linux-gnu' + qt_version: 6 - target: oracular-qt6.6 image_variant: oracular lib_postfix: '/x86_64-linux-gnu' + qt_version: 6 env: HOME: /home/runner runs-on: ubuntu-22.04 @@ -89,5 +92,7 @@ jobs: env: PKG_CONFIG_PATH: "/home/runner/BUILD_linux-x86_64/INSTALL/lib/pkgconfig:/home/runner/BUILD_linux-x86_64/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig" run: | + export QT_SELECT=qt${{matrix.qt_version}} + qmake --version qmake PREFIX=$HOME/BUILD_linux-x86_64/INSTALL make From 1c8a9809cf765cb84f5754670bb888118d01c8f8 Mon Sep 17 00:00:00 2001 From: Kelson Date: Sun, 5 Jan 2025 02:13:11 +0100 Subject: [PATCH 2/2] Use 2025-01-05 version of Linux CI containers --- .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 148ad3669..2ebb35adf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: HOME: /home/runner runs-on: ubuntu-22.04 container: - image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-12-18 + image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-01-05 steps: - name: Install dependencies