Skip to content

Commit 3c54944

Browse files
authored
CI: Fix arm64 jobs. (#286)
macOS-latest is an aarch64 host, while macOS-13 is an x86_64 host - the Julia arch should match. Also include Linux/arm64.
1 parent ee12a8a commit 3c54944

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

.github/workflows/Test.yml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,31 @@ jobs:
1515
test:
1616
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - PoCL ${{ matrix.pocl }}
1717
runs-on: ${{ matrix.os }}
18+
timeout-minutes: 180
19+
permissions: # needed to allow julia-actions/cache to proactively delete old caches that it has created
20+
actions: write
21+
contents: read
1822
strategy:
1923
fail-fast: false
2024
matrix:
2125
version: ['1.10', '1.11']
22-
os: ['ubuntu-latest', 'macOS-latest']
23-
arch: [x64]
24-
pocl: [jll]
25-
include:
26-
- version: '1.10'
27-
os: ubuntu-latest
26+
os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-13, macOS-15]
27+
arch: [x64, arm64]
28+
pocl: [jll, local]
29+
exclude:
30+
- os: ubuntu-24.04
31+
arch: arm64
32+
- os: ubuntu-24.04-arm
2833
arch: x64
29-
pocl: local
30-
- version: '1.11'
31-
os: ubuntu-latest
34+
# macOS 13 is Intel-only, while macOS 14+ only support Apple Silicon
35+
- os: macOS-15
3236
arch: x64
37+
- os: macOS-13
38+
arch: arm64
39+
# we only tested building PoCL on Linux
40+
- os: macOS-13
41+
pocl: local
42+
- os: macOS-15
3343
pocl: local
3444
steps:
3545
- name: Checkout OpenCL.jl

0 commit comments

Comments
 (0)