Skip to content

Commit a2c1f83

Browse files
Various CI fixes (#143)
* Display number of threads used in testing. * Fix running with multiple threadsand test both aarch64 and x64 on macos * Feedback
1 parent fe44c16 commit a2c1f83

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

.github/workflows/ci.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,16 @@ jobs:
1414
- 'pre'
1515
os:
1616
- ubuntu-latest
17-
- macos-latest
1817
- windows-latest
1918
arch:
2019
- x64
20+
include:
21+
- os: macos-latest
22+
arch: aarch64
23+
version: '1.10'
24+
- os: macos-latest
25+
arch: aarch64
26+
version: 'pre'
2127
steps:
2228
- uses: actions/checkout@v4
2329
- uses: julia-actions/setup-julia@v2
@@ -27,9 +33,9 @@ jobs:
2733
- uses: julia-actions/cache@v2
2834
- uses: julia-actions/julia-buildpkg@v1
2935
- uses: julia-actions/julia-runtest@v1
36+
env:
37+
JULIA_NUM_THREADS: 4,2
3038
- uses: julia-actions/julia-processcoverage@v1
3139
- uses: codecov/codecov-action@v5
3240
with:
3341
files: lcov.info
34-
env:
35-
JULIA_NUM_THREADS: 4,2

test/runtests.jl

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ using OhMyThreads: Consecutive, RoundRobin
44
using OhMyThreads.Experimental: @barrier
55
using OhMyThreads.Implementation: BoxedVariableError
66

7+
@info "Testing with $(Threads.nthreads(:default)),$(Threads.nthreads(:interactive)) threads."
8+
79
include("Aqua.jl")
810

911
sets_to_test = [(~ = isapprox, f = sin *, op = +,
@@ -544,7 +546,7 @@ end
544546
end
545547
end
546548

547-
let
549+
let
548550
x = Ref(0)
549551
y = Ref(0)
550552
try
@@ -758,7 +760,7 @@ end
758760
├ Chunking: fixed count ($(10 * nt)), split :roundrobin
759761
└ Threadpool: default"""
760762
end
761-
763+
762764
@testset "Boxing detection and error" begin
763765
let
764766
f1() = tmap(1:10) do i
@@ -790,7 +792,7 @@ end
790792

791793
@test_throws BoxedVariableError f1()
792794
@test f2() == 1:10
793-
795+
794796
A = 1 # Cause spooky action-at-a-distance by making A outer-local to the whole let block!
795797
end
796798

0 commit comments

Comments
 (0)