From c781cebf29c4999ef00caa38c231fd425b00e22a Mon Sep 17 00:00:00 2001
From: Peter Feerick <pfeerick@users.noreply.github.com>
Date: Thu, 17 Apr 2025 12:59:53 +1000
Subject: [PATCH] chore(ci): force use of mirrors for Qt for now (#6096)

---
 .github/workflows/macosx_cpn.yml | 10 +++++++---
 .github/workflows/win_cpn-64.yml | 14 ++++++++------
 tools/aqt-settings.ini           | 17 +++++++++++++++++
 3 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 tools/aqt-settings.ini

diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml
index 293938f8a..da813d9a7 100644
--- a/.github/workflows/macosx_cpn.yml
+++ b/.github/workflows/macosx_cpn.yml
@@ -45,10 +45,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Setup Python 3.9
+      - name: Setup Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.12'
 
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
@@ -56,10 +56,14 @@ jobs:
         run: cmake -E make_directory ${{github.workspace}}/build
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jdpurcell/install-qt-action@v5
+        env:
+          AQT_CONFIG: ${{ github.workspace }}/tools/aqt-settings.ini
         with:
           version: ${{ env.QT_VERSION }}
           setup-python: 'false'
+          cache: true
+          cache-key-prefix: 'install-qt-action-macOS'
 
       - name: Install dependencies
         run: python3 -m pip install --upgrade pip Pillow lz4 clang jinja2
diff --git a/.github/workflows/win_cpn-64.yml b/.github/workflows/win_cpn-64.yml
index 9ed936341..896c4d65a 100644
--- a/.github/workflows/win_cpn-64.yml
+++ b/.github/workflows/win_cpn-64.yml
@@ -69,19 +69,21 @@ jobs:
                                 mingw-w64-x86_64-openssl
           python -m pip install clang jinja2
 
+      - name: Check out the repo
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jdpurcell/install-qt-action@v5
+        env:
+          AQT_CONFIG: ${{ github.workspace }}/tools/aqt-settings.ini
         with:
           cache: true
           cache-key-prefix: 'install-qt-action-win64'
           version: ${{ env.QT_VERSION }}
           arch: ${{ env.MINGW_VERSION }}
 
-      - name: Check out the repo
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
       - name: Build
         working-directory: ${{github.workspace}}
         # Execute the build.  You can specify a specific target with "--target <NAME>"
diff --git a/tools/aqt-settings.ini b/tools/aqt-settings.ini
new file mode 100644
index 000000000..f03abea40
--- /dev/null
+++ b/tools/aqt-settings.ini
@@ -0,0 +1,17 @@
+[aqt]
+# Using this mirror instead of download.qt.io because of timeouts in CI
+# Below is the default URL of the mirror
+# baseurl: https://download.qt.io
+baseurl: https://qt.mirror.constant.com
+
+[requests]
+# Mirrors require sha1 instead of sha256
+hash_algorithm: sha1
+
+[mirrors]
+trusted_mirrors:
+    https://qt.mirror.constant.com
+fallbacks:
+    https://qt.mirror.constant.com
+    https://mirrors.ocf.berkeley.edu
+    https://download.qt.io
\ No newline at end of file