Merge pull request #832 from openzim/better-macos-ci

Check on all supported macOS versions
openzim · Nov 1, 2023 · e3316a4 · e3316a4
2 parents 13571d7 + e139fc2
commit e3316a4
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,16 +7,38 @@ on:
       - main
 
 jobs:
-  Macos:
+  macOS:
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - macos-11
+          - macos-12
+          - macos-13
+          - macos-13-xlarge
         target:
           - native_dyn
           - iOS_arm64
           - iOS_x86_64
-
-    runs-on: macos-12
+        exclude:
+          # iOS cross-compilation only on the 2 latest versions of macOS x86_64
+          - os: macos-11
+            target: iOS_arm64
+          - os: macos-11
+            target: iOS_x86_64
+          - os: macos-13-xlarge
+            target: iOS_arm64
+          - os: macos-13-xlarge
+            target: iOS_x86_64
+          # TODO: iOS cross-compilation on macOS 13 compilation has to be fixed
+          # https://github.com/openzim/libzim/issues/834
+          - os: macos-13
+            target: iOS_arm64
+          - os: macos-13
+            target: iOS_x86_64
+          # TODO: M1 runner is still in beta and not reliable
+          - os: macos-13-xlarge
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code