Test both macOS ARM64 and Intel in all workflows

pypdfium2-team · May 9, 2024 · 5ad40ab · 5ad40ab
1 parent 600d36c
commit 5ad40ab
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/conda.yaml b/.github/workflows/conda.yaml
@@ -79,7 +79,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+        # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
+        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
         py: ['3.8', '3.9', '3.10', '3.11']
 
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/test_release.yaml b/.github/workflows/test_release.yaml
@@ -16,8 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        py: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
+        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
+        py: ['3.8', '3.9', '3.10', '3.11']
 
     runs-on: ${{ matrix.os }}
 

diff --git a/.github/workflows/test_setup.yaml b/.github/workflows/test_setup.yaml
@@ -19,8 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        py: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
+        os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
+        py: ['3.8', '3.9', '3.10', '3.11']
 
     runs-on: ${{ matrix.os }}
 

diff --git a/.github/workflows/test_sourcebuild.yaml b/.github/workflows/test_sourcebuild.yaml
@@ -18,7 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        # NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
+        os: [ubuntu-latest, macos-13, macos-14, windows-latest]
         use_syslibs: [false]
         include:
           - os: ubuntu-latest