ci: try build for arm apple cpus

variar · Nov 18, 2024 · f1ebc17 · f1ebc17
1 parent 7137619
commit f1ebc17
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/actions/agent-setup/action.yml b/.github/actions/agent-setup/action.yml
@@ -14,6 +14,7 @@ runs:
         key: ${{ matrix.config.os }}-${{ matrix.config.arch }}-${{ matrix.config.qt_version }}-QtCache
 
     - name: Install Qt
+      if: ${{ matrix.config.qt_arch }}
       uses: jurplel/install-qt-action@v3
       with:
         version: ${{ matrix.config.qt_version }}

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -154,10 +154,15 @@ jobs:
           - os: macos
             os_version: 13
             qt_version: 6.7.3
-            qt_modules: qt5compat
             arch: x64
-            artifacts_id: macos-qt6
+            artifacts_id: macos-intel-qt6
             cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=13.0
+          - os: macos
+            os_version: 14
+            qt_version: 6.7.3
+            arch: arm64
+            artifacts_id: macos-arm-qt6
+            cmake_opts: -DKLOGG_OSX_DEPLOYMENT_TARGET=14.0
 
     runs-on: ${{ matrix.config.os }}-${{ matrix.config.os_version }}
     steps:
@@ -172,7 +177,8 @@ jobs:
 
       - name: Brew deps
         run: |
-          brew install ragel
+          brew install ragel qt6
+          echo "Qt6_Dir=$HOMEBREW_PREFIX/opt/qt@6" >> $GITHUB_ENV
 
       - uses: ./.github/actions/agent-setup
       - uses: ./.github/actions/klogg-version