From 8b0eb81ac886cb7670b47b4ee04daf920ba2bc18 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 26 Dec 2024 17:53:24 +0100 Subject: [PATCH 1/2] Windows base-deps using Qt6 --- .github/workflows/cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 855a787..7bbcde8 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -39,8 +39,8 @@ jobs: - name: Install QT uses: jurplel/install-qt-action@v4 with: - version: 5.15.2 - modules: "qtwebengine" + version: 6.4.3 + modules: "qtwebengine qtwebchannel qtpositioning" setup-python: false - name: Setup MSVC compiler uses: bus1/cabuild/action/msdevshell@v1 From a28360473f7a37d2fe92ea7ebd48e9127d638e71 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Thu, 26 Dec 2024 17:57:06 +0100 Subject: [PATCH 2/2] Use latest CI/CD container images --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 7bbcde8..40ae484 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -138,7 +138,7 @@ jobs: SSH_KEY: /tmp/id_rsa runs-on: ubuntu-22.04 container: - image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-11-30" + image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-01-05" options: "--device /dev/fuse --privileged" steps: - name: Checkout code diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf56096..4ffd71f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,7 +115,7 @@ jobs: OS_NAME: ${{matrix.image_variant}} runs-on: ubuntu-22.04 container: - image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2024-11-30" + image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-01-05" options: "--device /dev/fuse --privileged" steps: - name: Checkout code