From bfbc4f3b0d573010e99a2c9d337fe44730570e52 Mon Sep 17 00:00:00 2001
From: Daniel Nicoletti <daniel.nicoletti@kdab.com>
Date: Mon, 13 May 2024 17:04:26 -0300
Subject: [PATCH] Fix Qt5 Apple Silicon builds forcing x86_64 arch

---
 .github/workflows/build.yml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c1651f2..2c68cd4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,28 +19,25 @@ jobs:
       fail-fast: true
       matrix:
         os:
-          - ubuntu-22.04
-          #- ubuntu-20.04
-          - windows-2022
-          #- windows-2019
-          - macos-12
-          #- macos-11
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+
         build_type:
           - Debug
-          #- Release
-        qt:
-          - version: "5.15.2"
-            requested: "5.15"
-          - version: "6.5.3"
-            requested: "6.5.*"
+
+        config:
+          - qt_version: "5.15.2"
+            cmake_osx_architectures: "x86_64"
+
+          - qt_version: "6.5.3"
 
     steps:
       - name: Install Qt with options and default aqtversion
         uses: jurplel/install-qt-action@v3
         with:
           aqtversion: null # use whatever the default is
-          modules: ${{ matrix.qt.modules }}
-          version: ${{ matrix.qt.requested }}
+          version: ${{ matrix.config.qt_version }}
           cache: true
 
       - name: Checkout sources
@@ -59,7 +56,8 @@ jobs:
         run: >
           cmake -S . -B ./build -G Ninja
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-          -DKDSingleApplication_QT6=${{ startsWith(matrix.qt.version, '6.') }}
+          -DCMAKE_OSX_ARCHITECTURES=${{ matrix.config.cmake_osx_architectures}}
+          -DKDSingleApplication_QT6=${{ startsWith(matrix.config.qt_version, '6.') }}
           -DKDSingleApplication_DEVELOPER_MODE=${{ matrix.build_type == 'Debug' }}
           -DKDSingleApplication_TESTS=${{ matrix.build_type == 'Debug' }}
           -DKDSingleApplication_EXAMPLES=${{ matrix.build_type == 'Debug' }}