Assign CMAKE_OSX_ARCHITECTURES in its own step

So we can add more logic to it shortly.
pcolby · Oct 4, 2024 · 271da5c · 271da5c
1 parent b342e39
commit 271da5c
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -160,6 +160,7 @@ jobs:
         - { cc: gcc-14, cxx: g++-14, coverage: false }
         #- { cc: gcc-14, cxx: g++-14, coverage: true }
         exclude:
+          #- { qt: '5.10.1', env: { cc: gcc-14 } } # Compiler warnings (treated as errors) in generated moc code.
           # Exclude Qt 5.x with GCC on macOS 13 (Qt5 only officially supports up to macOS 12).
           - { qt: '5.9.9',   os: 'macos-13', env: { cc: gcc-12 } }
           - { qt: '5.10.1',  os: 'macos-13', env: { cc: gcc-12 } }
@@ -169,15 +170,15 @@ jobs:
           - { qt: '5.14.2',  os: 'macos-13', env: { cc: gcc-12 } }
           - { qt: '5.15.2',  os: 'macos-13', env: { cc: gcc-12 } }
           # Exclude Qt 5.x on macOS 14+ (Qt5 only officially supports up to macOS 12).
-          - { qt: '5.9.9',   os: 'macos-14' }
-          - { qt: '5.10.1',  os: 'macos-14' }
-          - { qt: '5.11.3',  os: 'macos-14' }
-          - { qt: '5.12.12', os: 'macos-14' }
-          - { qt: '5.13.2',  os: 'macos-14' }
-          - { qt: '5.14.2',  os: 'macos-14' }
-          - { qt: '5.15.2',  os: 'macos-14' }
+          #- { qt: '5.9.9',   os: 'macos-14' }
+          #- { qt: '5.10.1',  os: 'macos-14' }
+          #- { qt: '5.11.3',  os: 'macos-14' }
+          #- { qt: '5.12.12', os: 'macos-14' }
+          #- { qt: '5.13.2',  os: 'macos-14' }
+          #- { qt: '5.14.2',  os: 'macos-14' }
+          #- { qt: '5.15.2',  os: 'macos-14' }
           # Exclude Qt 6.2 on macOS 14+ (Qt6 only officially supports macOS 14 from Qt 6.4+, and some 6.2.n LTS update).
-          - { qt: '6.2.4',   os: 'macos-14' }
+          #- { qt: '6.2.4',   os: 'macos-14' }
           # Exclude Qt 5.10 with GCC on macOS. See https://bugreports.qt.io/browse/QTBUG-66585
           - { qt: '5.10.1', env: { cc: gcc-12 } }
           # Exclude Qt6 with GCC on macOS for now, as GCC (only) has lots of false compiler
@@ -211,12 +212,15 @@ jobs:
         name: aqtinstall-log-${{ matrix.os }}-${{ matrix.env.cc }}-${{ matrix.qt }}${{ matrix.env.coverage && '-cov' || ''}}
         path: aqtinstall.log
         if-no-files-found: error
+    - name: Choose target architectures
+      run: |
+        # \todo more logic here
+        echo "CMAKE_OSX_ARCHITECTURES=arm64;x86_64" >> $GITHUB_ENV
     - name: Build
       id: build
       env:
         CC:  ${{ matrix.env.cc }}
         CXX: ${{ matrix.env.cxx }}
-        CMAKE_OSX_ARCHITECTURES: ${{ startsWith(matrix.qt, '6') && 'arm64;' || '' }}x86_64
         PROJECT_BUILD_ID: ${{ github.run_number }}.${{ matrix.os }}.${{ startsWith(matrix.qt, '6') && 'arm64-' || '' }}x86_64.${{ matrix.env.cc }}${{ matrix.env.coverage && '-cov' || '' }}.qt-${{ matrix.qt }}
       run: |
         cmake -D CMAKE_BUILD_TYPE=Release \