From ac1da081ea2847c50d1071ec64ca1e1f9f26de67 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 2ec4a69..477d623 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -40,8 +40,8 @@ jobs: if: ${{ matrix.config == 'native_mixed' }} uses: jurplel/install-qt-action@v4 with: - version: 5.15.2 - modules: "qtwebengine" + version: 6.4.3 + modules: "qtwebengine qtwebchannel qtpositioning" setup-python: false env: AQT_CONFIG: ${{ github.workspace }}/.github/configs/aqt.ini From e58ad888fe72a0a53600e9f533522d565a0d3ce0 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 477d623..11ac5a6 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -141,7 +141,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 56391c4..08b4c9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,7 +118,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