Skip to content

Commit 5ad40ab

Browse files
committed
Test both macOS ARM64 and Intel in all workflows
1 parent 600d36c commit 5ad40ab

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/conda.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ jobs:
7979
strategy:
8080
fail-fast: false
8181
matrix:
82-
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
82+
# NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
83+
os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
8384
py: ['3.8', '3.9', '3.10', '3.11']
8485

8586
runs-on: ${{ matrix.os }}

.github/workflows/test_release.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
20-
py: ['3.7', '3.8', '3.9', '3.10', '3.11']
19+
# NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
20+
os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
21+
py: ['3.8', '3.9', '3.10', '3.11']
2122

2223
runs-on: ${{ matrix.os }}
2324

.github/workflows/test_setup.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
23-
py: ['3.7', '3.8', '3.9', '3.10', '3.11']
22+
# NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
23+
os: ['ubuntu-latest', 'macos-13', 'macos-14', 'windows-latest']
24+
py: ['3.8', '3.9', '3.10', '3.11']
2425

2526
runs-on: ${{ matrix.os }}
2627

.github/workflows/test_sourcebuild.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-latest, macos-latest, windows-latest]
21+
# NOTE On GH actions, macOS <=13 is Intel, whereas macOS >=14 will be ARM64
22+
os: [ubuntu-latest, macos-13, macos-14, windows-latest]
2223
use_syslibs: [false]
2324
include:
2425
- os: ubuntu-latest

0 commit comments

Comments
 (0)