Skip to content

Commit a1249e2

Browse files
committed
remove buildpkg
1 parent b288269 commit a1249e2

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.github/workflows/UnitTests.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
using Pkg
5151
Pkg.develop(path="lib/MPIPreferences")
5252
53-
- uses: julia-actions/julia-buildpkg@latest
5453
- uses: julia-actions/julia-runtest@latest
5554

5655
test-openmpi-jll:
@@ -97,7 +96,6 @@ jobs:
9796
using MPIPreferences
9897
MPIPreferences.use_jll_binary("OpenMPI_jll", export_prefs=true)
9998
100-
- uses: julia-actions/julia-buildpkg@latest
10199
- uses: julia-actions/julia-runtest@latest
102100

103101
test-system-brew:
@@ -145,7 +143,6 @@ jobs:
145143
Pkg.develop(path="lib/MPIPreferences")
146144
using MPIPreferences
147145
MPIPreferences.use_system_binary(export_prefs=true)
148-
- uses: julia-actions/julia-buildpkg@latest
149146
- uses: julia-actions/julia-runtest@latest
150147
env:
151148
# TODO: Only disable this test for MPICH. OpenMPI works fine.
@@ -201,7 +198,6 @@ jobs:
201198
using MPIPreferences
202199
MPIPreferences.use_system_binary(export_prefs=true)
203200
204-
- uses: julia-actions/julia-buildpkg@latest
205201
- uses: julia-actions/julia-runtest@latest
206202

207203
test-intel-linux:
@@ -314,7 +310,6 @@ jobs:
314310
using MPIPreferences
315311
MPIPreferences.use_system_binary(export_prefs=true)
316312
317-
- uses: julia-actions/julia-buildpkg@latest
318313
- uses: julia-actions/julia-runtest@latest
319314

320315

@@ -328,7 +323,7 @@ jobs:
328323
mpi: [mpitrampoline]
329324
julia_version:
330325
- "1.6"
331-
- "1.7"
326+
- "1"
332327
- "nightly"
333328
julia_arch:
334329
- x64
@@ -364,7 +359,6 @@ jobs:
364359
using MPIPreferences
365360
MPIPreferences.use_jll_binary("MPItrampoline", export_prefs=true)
366361
367-
- uses: julia-actions/julia-buildpkg@latest
368362
- uses: julia-actions/julia-runtest@latest
369363

370364

@@ -562,7 +556,6 @@ jobs:
562556
${{ runner.os }}-test-
563557
${{ runner.os }}-
564558
565-
- uses: julia-actions/julia-buildpkg@latest
566559
- uses: julia-actions/julia-runtest@latest
567560

568561

test/runtests.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ using Test, MPI
22

33
using MPIPreferences
44

5-
@show MPIPreferences.abi MPIPreferences.binary
6-
75
# load test packages to trigger precompilation
86
using DoubleFloats
97
if get(ENV, "JULIA_MPI_TEST_ARRAYTYPE", "") == "CuArray"
@@ -22,7 +20,14 @@ end
2220
nprocs_str = get(ENV, "JULIA_MPI_TEST_NPROCS", "")
2321
nprocs = nprocs_str == "" ? clamp(Sys.CPU_THREADS, 2, 4) : parse(Int, nprocs_str)
2422

25-
@info "Running MPI tests" ArrayType nprocs
23+
@info "Running MPI tests" ArrayType nprocs MPIPreferences.abi MPIPreferences.binary
24+
25+
if haskey(ENV,"JULIA_MPI_TEST_BINARY")
26+
@test ENV["JULIA_MPI_TEST_BINARY"] == MPIPreferences.binary
27+
end
28+
if haskey(ENV,"JULIA_MPI_TEST_ABI")
29+
@test ENV["JULIA_MPI_TEST_ABI"] == MPIPreferences.abi
30+
end
2631

2732
testdir = @__DIR__
2833
istest(f) = endswith(f, ".jl") && startswith(f, "test_")

0 commit comments

Comments
 (0)