Skip to content

Commit 1f5d00c

Browse files
committed
CI: don't force arch unless needed
... so that e.g. macOS ARM runners can use a native Julia However for Julia 1.6 on macOS we need to take special care, see <https://discourse.julialang.org/t/117019> for details.
1 parent c527b63 commit 1f5d00c

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.github/workflows/CI.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,25 @@ jobs:
1818
# - 'nightly'
1919
os:
2020
- ubuntu-latest
21-
- macOS-latest
21+
- macos-latest
2222
- windows-latest
2323
arch:
24-
- x64
24+
- ''
25+
exclude:
26+
- os: macos-latest # Apple Silicon
27+
version: '1.6'
28+
arch: ''
29+
include:
30+
- os: macos-latest # Apple Silicon
31+
version: '1.6'
32+
# Install an x86_64 build of Julia, and run it under Rosetta 2 emulation
33+
arch: 'x64'
2534
steps:
2635
- uses: actions/checkout@v4
2736
- uses: julia-actions/setup-julia@v2
2837
with:
2938
version: ${{ matrix.version }}
30-
arch: ${{ matrix.arch }}
39+
arch: ${{ (matrix.julia-arch == '') && runner.arch || matrix.julia-arch }}
3140
- uses: julia-actions/cache@v2
3241
- uses: julia-actions/julia-buildpkg@v1
3342
- uses: julia-actions/julia-runtest@v1

0 commit comments

Comments
 (0)