CI: introduce macOS build for Qt6

fougue · May 20, 2024 · bf09401 · bf09401
1 parent 3fda6b0
commit bf09401
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml
@@ -9,6 +9,7 @@ jobs:
                 qt_version: [5.15.2, 6.5.2]
 
         runs-on: ubuntu-latest
+        name: build-linux-qt${{matrix.qt_version}}
 
         steps:
         - name: Checkout

diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
@@ -4,14 +4,23 @@ on: [push]
 
 jobs:
     build-macos:
+        strategy:
+            matrix:
+                include:
+                    - qt_version_name: 5.15
+                      qt_version_major: 5
+                    - qt_version_name: 6.7
+                      qt_version_major: 6
+
         runs-on: macos-latest
+        name: build-macos-qt${{matrix.qt_version_name}}
 
         steps:
         - name: Checkout
           uses: actions/checkout@v2
 
         - name: Install Qt
-          run: brew install qt@5
+          run: brew install qt@${{matrix.qt_version_major}}
 
         - name: Install OpenCascade
           run: brew install opencascade
@@ -25,16 +34,13 @@ jobs:
 
         - name: Build
           run: |
-              echo "brew --prefix qt@5"
-              brew --prefix qt@5
-
               mkdir ${{github.workspace}}/build
               cd ${{github.workspace}}/build
               cmake --version
               cmake .. \
                     -DMayo_BuildTests=ON \
                     -DMayo_BuildPluginAssimp=ON \
-                    -DQT_DIR=$(brew --prefix qt@5)/lib/cmake/Qt5
+                    -DQT_DIR=$(brew --prefix qt@${{matrix.qt_version_major}})/lib/cmake/Qt${{matrix.qt_version_major}}
               cmake --build . \
                     --config Release \
                     --parallel ${{steps.cpu-cores.outputs.count}}