Exclude macOS 14+ w/ gcc w/ Qt <6.2

pcolby · Oct 4, 2024 · 4730ac1 · 4730ac1
1 parent aeae589
commit 4730ac1
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -161,22 +161,21 @@ jobs:
         #- { 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 } }
-          - { qt: '5.11.3',  os: 'macos-13', env: { cc: gcc-12 } }
-          - { qt: '5.12.12', os: 'macos-13', env: { cc: gcc-12 } }
-          - { qt: '5.13.2',  os: 'macos-13', env: { cc: gcc-12 } }
-          - { 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' }
+          # GitHub's macOS 14+ gcc can only target arm64, but the Qt Online Installer only provides ARM64 from 6.2+
+          - { qt: '5.9.9',   os: macos-14, cc: { cc: gcc-14 } }
+          - { qt: '5.9.9',   os: macos-15, cc: { cc: gcc-14 } }
+          - { qt: '5.10.1',  os: macos-14, cc: { cc: gcc-14 } }
+          - { qt: '5.10.1',  os: macos-15, cc: { cc: gcc-14 } }
+          - { qt: '5.11.3',  os: macos-14, cc: { cc: gcc-14 } }
+          - { qt: '5.11.3',  os: macos-15, cc: { cc: gcc-14 } }
+          - { qt: '5.12.12', os: macos-14, cc: { cc: gcc-14 } }
+          - { qt: '5.12.12', os: macos-15, cc: { cc: gcc-14 } }
+          - { qt: '5.13.2',  os: macos-14, cc: { cc: gcc-14 } }
+          - { qt: '5.13.2',  os: macos-15, cc: { cc: gcc-14 } }
+          - { qt: '5.14.2',  os: macos-14, cc: { cc: gcc-14 } }
+          - { qt: '5.14.2',  os: macos-15, cc: { cc: gcc-14 } }
+          - { qt: '5.15.2',  os: macos-14, cc: { cc: gcc-14 } }
+          - { qt: '5.15.2',  os: macos-15, cc: { cc: gcc-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' }
           # Exclude Qt 5.10 with GCC on macOS. See https://bugreports.qt.io/browse/QTBUG-66585