From c8775bb740cd5b9462630e5b113ed5d233e0df74 Mon Sep 17 00:00:00 2001
From: Geoff Hutchison <geoff.hutchison@gmail.com>
Date: Tue, 12 Nov 2024 14:05:36 -0500
Subject: [PATCH] Bumping to Qt 6.8 (latest LTS) for Mac and Windows builds
 (#1751)

* Try bumping to Qt 6.8 (latest LTS) for builds

Also use mac-latest to try building Apple Silicon / universal

Signed-off-by: Geoff Hutchison <geoff.hutchison@gmail.com>
---
 .github/workflows/build_qt6.yml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_qt6.yml b/.github/workflows/build_qt6.yml
index 62b7047feb..c350049c49 100644
--- a/.github/workflows/build_qt6.yml
+++ b/.github/workflows/build_qt6.yml
@@ -7,7 +7,7 @@ name: Qt6 Build Matrix
 on: [push, pull_request, workflow_dispatch]
 
 env:
-  QT_VERSION: 6.5.3
+  QT_VERSION: 6.8.0
   # this is different from MACOSX_DEPLOYMENT_TARGET to prevent build problems
   # we set MACOSX_DEPLOYMENT_TARGET later
   MACOS_TARGET: 10.15
@@ -39,10 +39,10 @@ jobs:
           }
         - {
             name: "macOS Qt6", artifact: "",
-            os: macos-13,
+            os: macos-latest,
             cc: "clang", cxx: "clang++",
             build_type: "Release",
-            cmake_flags: "-G Ninja",
+            cmake_flags: "-G Ninja -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64'",
             cpack_flags: "-G DragNDrop",
           }
         - {
@@ -65,11 +65,7 @@ jobs:
     - name: Install Dependencies (macOS)
       if: runner.os == 'macOS'
       run: |
-        if uname -p | grep -q "arm" ; then
-           export PATH=/opt/homebrew/bin:$PATH
-        else # not self-hosted runner
-          brew install ninja eigen glew
-        fi
+        brew install ninja eigen glew
     - name: Install Dependencies (Windows)
       if: runner.os == 'Windows'
       run: choco install ninja
@@ -92,11 +88,20 @@ jobs:
         path: avogadrolibs
 
     - name: Install Qt
+      if: runner.os != 'Windows'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        aqtversion: '==3.1.*'
+
+    - name: Install Qt (Windows)
+      if: runner.os == 'Windows'
       uses: jurplel/install-qt-action@v3
       with:
         version: ${{ env.QT_VERSION }}
         aqtversion: '==3.1.*'
-        modules: 'qt5compat'
+        host: windows
+        arch: win64_msvc2022_64
 
     - name: Configure MSVC Command Prompt
       if: runner.os == 'Windows'
@@ -135,7 +140,7 @@ jobs:
         if (NOT result EQUAL 0)
           message(FATAL_ERROR "Running tests failed!")
         endif()
-    
+
     - name: Upload
       if: matrix.config.artifact != 0
       uses: actions/upload-artifact@v4