Merge a28360473f into 1aa720a7fd

Use latest CI/CD container images
Windows base-deps using Qt6
2025-04-11 15:50:40 +02:00 · 2025-04-11 15:50:37 +02:00 · 2025-04-11 15:50:37 +02:00
2 changed files with 4 additions and 4 deletions
--- 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
+        version: 6.4.3
-        modules: "qtwebengine"
+        modules: "qtwebengine qtwebchannel qtpositioning"
        setup-python: false
    - name: Setup MSVC compiler
      uses: bus1/cabuild/action/msdevshell@v1
@ -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
--- 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
Author	SHA1	Message	Date
Kelson	3ff948d839	Merge `a28360473f` into `1aa720a7fd`	2025-04-11 15:50:40 +02:00
Emmanuel Engelhart	a28360473f	Use latest CI/CD container images	2025-04-11 15:50:37 +02:00
Emmanuel Engelhart	8b0eb81ac8	Windows base-deps using Qt6	2025-04-11 15:50:37 +02:00