Skip to content

Commit 5e840a6

Browse files
Fix macos CI (#406)
* Use buildkite for macOS until github runners can be debugged * Limit x64 tests to newer macos * Test x86-64 macos on github
1 parent 0dc61aa commit 5e840a6

2 files changed

Lines changed: 36 additions & 15 deletions

File tree

.buildkite/pipeline.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,37 @@ steps:
2121
env:
2222
OCL_ICD_FILENAMES: "libnvidia-opencl.so.1"
2323
timeout_in_minutes: 60
24+
25+
- group: "macos"
26+
key: "julia"
27+
steps:
28+
- label: "{{matrix.julia}} macos"
29+
plugins:
30+
- JuliaCI/julia#v1:
31+
version: "{{matrix.julia}}"
32+
- JuliaCI/julia-coverage#v1:
33+
codecov: true
34+
commands: |
35+
julia --project -e '
36+
using Pkg
37+
38+
println("--- :julia: Instantiating project")
39+
Pkg.add("pocl_jll")
40+
Pkg.add("InteractiveUtils")
41+
Pkg.develop(path="lib/intrinsics")
42+
43+
println("+++ :julia: Running tests")
44+
using InteractiveUtils
45+
InteractiveUtils.versioninfo()
46+
Pkg.test(; coverage=true, test_args=`--platform=pocl`)'
47+
agents:
48+
queue: "juliaecosystem"
49+
os: "macos"
50+
arch: "aarch64"
51+
if: build.message !~ /\[skip tests\]/
52+
timeout_in_minutes: 120
53+
matrix:
54+
setup:
55+
julia:
56+
- "1.10"
57+
- "1.12"

.github/workflows/Test.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
version: ['1.10', '1.12']
26-
os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-15, macOS-15-intel, windows-2022]
26+
os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-15-intel, windows-2022]
2727
arch: [x64, arm64]
2828
pocl: [jll, local]
2929
memory_backend: [usm, svm, buffer]
@@ -35,27 +35,14 @@ jobs:
3535
arch: arm64
3636
- os: ubuntu-24.04-arm
3737
arch: x64
38-
# macOS 13 is Intel-only, while macOS 14+ only support Apple Silicon
39-
- os: macOS-15
40-
arch: x64
38+
# macOS-15-intel is Intel-only
4139
- os: macOS-15-intel
4240
arch: arm64
4341
# we only test building PoCL on Linux
4442
- os: macOS-15-intel
4543
pocl: local
46-
- os: macOS-15
47-
pocl: local
4844
- os: windows-2022
4945
pocl: local
50-
# Remove these exclusions once macOS CI hangs are fixed
51-
- os: macOS-15-intel
52-
memory_backend: svm
53-
- os: macOS-15-intel
54-
memory_backend: buffer
55-
- os: macOS-15
56-
memory_backend: svm
57-
- os: macOS-15
58-
memory_backend: buffer
5946
steps:
6047
- name: Checkout OpenCL.jl
6148
uses: actions/checkout@v6

0 commit comments

Comments
 (0)