From 2d73f9b2600d153d61774a926cbfa2e40c4825c9 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej@tano.si>
Date: Sat, 17 Feb 2024 22:47:07 +0100
Subject: [PATCH] [qt] Try to stabilise the CI (#2120)

Co-authored-by: Bart Louwers <bart@emeel.net>
---
 .github/actionlint.yaml     |  1 +
 .github/workflows/qt-ci.yml | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 2ef1c46f4ab..a5c10e5b851 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -2,6 +2,7 @@ self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
   labels:
     - MapLibre_Native_Linux_16_core
+    - macos-14  # can be removed once actionlint is updated
 # Configuration variables in array of strings defined in your repository or
 # organization. `null` means disabling configuration variables check.
 # Empty array means no configuration variable is allowed.
diff --git a/.github/workflows/qt-ci.yml b/.github/workflows/qt-ci.yml
index 284b0e558fb..83f7a3ebc17 100644
--- a/.github/workflows/qt-ci.yml
+++ b/.github/workflows/qt-ci.yml
@@ -78,7 +78,7 @@ jobs:
             qt_target: desktop
             compiler: "gcc-13"
           - name: macOS
-            os: macos-12
+            os: macos-13
             build_type: RelWithDebInfo
             qt_version: 5.15.2
             qt_target: desktop
@@ -86,20 +86,20 @@ jobs:
             deployment_arch: "x86_64"
             compiler: ""
           - name: macOS
-            os: macos-12
+            os: macos-14
             build_type: RelWithDebInfo
-            qt_version: 6.5.3
+            qt_version: 6.6.2
             qt_target: desktop
             deployment_target: 11.0
             deployment_arch: "x86_64;arm64"
             compiler: ""
           - name: macOS_LLVM17
-            os: macos-13
+            os: macos-14
             build_type: RelWithDebInfo
-            qt_version: 6.5.3
+            qt_version: 6.6.2
             qt_target: desktop
             deployment_target: 11.0
-            deployment_arch: "x86_64"
+            deployment_arch: "arm64"
             compiler: "llvm@17"
           - name: win64_msvc2019
             os: windows-2022
@@ -145,6 +145,7 @@ jobs:
       - name: Install test dependencies
         if: runner.os == 'Linux' && matrix.compiler != ''
         run: |
+          sudo apt-get update
           sudo apt-get install \
             libxkbcommon-x11-0 \
             libxcb-cursor0 \
@@ -184,12 +185,12 @@ jobs:
           # https://github.com/actions/runner-images/issues/8838#issuecomment-1817486924
           brew link --overwrite python@3.12
           brew install "$MLN_COMPILER"
-          echo "/usr/local/opt/${MLN_COMPILER}/bin" >> "$GITHUB_PATH"
+          echo "/opt/homebrew/opt/${MLN_COMPILER}/bin" >> "$GITHUB_PATH"
           {
-            echo "CC=/usr/local/opt/${MLN_COMPILER}/bin/clang"
-            echo "CXX=/usr/local/opt/${MLN_COMPILER}/bin/clang++"
-            echo "LDFLAGS=\"-L/usr/local/opt/${MLN_COMPILER}/lib\""
-            echo "CPPFLAGS=\"-I/usr/local/opt/${MLN_COMPILER}/include\""
+            echo "CC=/opt/homebrew/opt/${MLN_COMPILER}/bin/clang"
+            echo "CXX=/opt/homebrew/opt/${MLN_COMPILER}/bin/clang++"
+            echo "LDFLAGS=\"-L/opt/homebrew/opt/${MLN_COMPILER}/lib\""
+            echo "CPPFLAGS=\"-I/opt/homebrew/opt/${MLN_COMPILER}/include\""
           } >> "$GITHUB_ENV"
 
       - name: Setup Xcode
@@ -217,6 +218,7 @@ jobs:
           target: ${{ matrix.qt_target }}
           arch: ${{ matrix.qt_arch }}
           tools: ${{ matrix.qt_tools }}
+          extra: --base https://mirrors.ocf.berkeley.edu/qt/
 
       - name: Update ccache
         if: runner.os == 'Windows'