From f7c62627b90dd4d1ca096bf9503437c2292018fe Mon Sep 17 00:00:00 2001
From: Ben Ford <ben.ford@kdab.com>
Date: Mon, 14 Oct 2024 15:26:49 +0100
Subject: [PATCH] Update CI runners to use aqt install

---
 .github/workflows/github-cxx-qt-tests.yml | 43 +++++++++++++++--------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/github-cxx-qt-tests.yml b/.github/workflows/github-cxx-qt-tests.yml
index d361afeb8..2e4151b20 100644
--- a/.github/workflows/github-cxx-qt-tests.yml
+++ b/.github/workflows/github-cxx-qt-tests.yml
@@ -224,6 +224,9 @@ jobs:
           - name: Ubuntu 22.04 (gcc) Qt5
             os: ubuntu-22.04
             qt_version: 5
+            aqt_version: '5.15.2'
+            aqt_arch: 'gcc_64'
+            aqt_host: 'linux'
             vcpkg: off
             vcpkg_triplet: x64-linux-release
             cores: 4
@@ -234,17 +237,13 @@ jobs:
             compiler_cache_path: /home/runner/.cache/sccache
             clang_format_path: /home/runner/.local/bin/clang-format
             cargo_dir: ~/.cargo
-            packages-extra: >-
-                qtbase5-dev
-                qtdeclarative5-dev
-                qtquickcontrols2-5-dev
-                qml-module-qtquick2
-                qml-module-qtquick-controls2
-                qml-module-qttest
             workspace: /home/runner/cxx-qt
           - name: Ubuntu 22.04 (gcc) Qt6
             os: ubuntu-22.04
             qt_version: 6
+            aqt_version: '6.7.3'
+            aqt_arch: 'linux_gcc_64'
+            aqt_host: 'linux'
             vcpkg: off
             vcpkg_triplet: x64-linux-release
             cores: 4
@@ -256,13 +255,6 @@ jobs:
             clang_format_path: /home/runner/.local/bin/clang-format
             cargo_dir: ~/.cargo
             packages-extra: >-
-                qt6-base-dev
-                qt6-declarative-dev
-                qt6-declarative-dev-tools
-                qml6-module-qtquick-controls
-                qml6-module-qtquick-window
-                qml6-module-qttest
-                qml6-module-qtqml-workerscript
                 libgl1-mesa-dev
                 libvulkan-dev
                 libxkbcommon-dev
@@ -271,6 +263,9 @@ jobs:
           - name: macOS 12 (clang) Qt5
             os: macos-12
             qt_version: 5
+            aqt_version: '5.15.2'
+            aqt_arch: 'clang_64'
+            aqt_host: 'mac'
             vcpkg: on
             vcpkg_triplet: x64-osx-release
             cores: 3
@@ -287,6 +282,9 @@ jobs:
           - name: macOS 12 (clang) Qt6
             os: macos-12
             qt_version: 6
+            aqt_version: '6.7.3'
+            aqt_arch: 'clang_64'
+            aqt_host: 'mac'
             vcpkg: on
             vcpkg_triplet: x64-osx-release
             cores: 3
@@ -304,6 +302,9 @@ jobs:
           - name: Windows 2022 (MSVC) Qt5
             os: windows-2022
             qt_version: 5
+            aqt_version: '5.15.2'
+            aqt_arch: 'win64_msvc2019_64'
+            aqt_host: 'windows'
             vcpkg: on
             # Use a short buildtrees root for building vcpkg
             vcpkg_buildtrees_root: C:\v
@@ -322,6 +323,9 @@ jobs:
           - name: Windows 2022 (MSVC) Qt6
             os: windows-2022
             qt_version: 6
+            aqt_version: '6.7.3'
+            aqt_arch: 'win64_msvc2019_64'
+            aqt_host: 'windows'
             vcpkg: on
             # Use a short buildtrees root for building vcpkg
             vcpkg_buildtrees_root: C:\v
@@ -409,6 +413,17 @@ jobs:
         pip install --user clang-format==18.1.8
         test -x ${{ matrix.clang_format_path }}
 
+    # Version info found using https://ddalcino.github.io/aqt-list-server/
+    - name: "Install Qt"
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: ${{ matrix.aqt_version }}
+        host: ${{ matrix.aqt_host }}
+        target: 'desktop'
+        arch: ${{ matrix.aqt_arch }}
+        tools: 'tools_cmake'
+        cache: true
+
     - name: "[Ubuntu] Install dependencies"
       if: runner.os == 'Linux'
       run: >-