Skip to content

Commit b2cbb65

Browse files
authored
Merge pull request #296 from JuliaMath/vs/mac-aarch64-ci
Update CI.yml for Apple Silicon
2 parents 38bf91b + ef4e730 commit b2cbb65

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

.github/workflows/CI.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,16 @@ jobs:
3232
- 'nightly'
3333
os:
3434
- ubuntu-latest
35-
- macOS-latest
3635
- windows-latest
36+
- macOS-13 # intel
37+
- macOS-14 # arm
3738
threads:
3839
- '1'
3940
- '2'
4041
arch:
4142
- x64
4243
- x86
44+
- aarch64
4345
exclude:
4446
# 32-bit Julia binaries are not available on macOS
4547
- os: macOS-latest
@@ -50,7 +52,27 @@ jobs:
5052
arch: x86
5153
- provider: 'mkl'
5254
threads: '2'
53-
55+
# Disable various OS-arch combinations that are not available
56+
- os: ubuntu-latest
57+
arch: aarch64
58+
- os: windows-latest
59+
arch: aarch64
60+
- os: macOS-13
61+
arch: x86
62+
- os: macOS-13
63+
arch: aarch64
64+
- os: macOS-13
65+
version: '1.6'
66+
provider: 'mkl'
67+
- os: macOS-14
68+
arch: x86
69+
- os: macOS-14
70+
arch: x64
71+
- os: macOS-14
72+
version: '1.6'
73+
- os: macOS-14
74+
provider: 'mkl'
75+
5476
steps:
5577
- uses: actions/checkout@v4
5678
- uses: julia-actions/setup-julia@v1
@@ -62,7 +84,7 @@ jobs:
6284
# So, in CI, for the macOS jobs, we force MKL 2023 to be installed (instead of
6385
# MKL 2024).
6486
- run: julia .ci/macos_mkl_2023.jl
65-
if: (matrix.os == 'macOS-latest') && (matrix.provider == 'mkl')
87+
if: (matrix.os == 'macOS-13') && (matrix.provider == 'mkl')
6688
- name: Set Preferences
6789
run: julia --project .github/set_ci_preferences.jl "${{ matrix.provider }}"
6890
- uses: julia-actions/julia-runtest@v1

0 commit comments

Comments
 (0)