From e129aea76a35b2da596ab94d2efa76c1dbfe96d9 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Tue, 25 Nov 2025 13:14:49 -0500 Subject: [PATCH 1/2] Separate out tests for the GPL build and do not run them when GPL libs are not present (#658) Fix #655 The tests marked broken in this PR seem to be an unfortunate regression that doesn't have to do with this PR. @jishnub This seems to have to do with methods that multiply a SparseMatrixCSC with a Diagonal and the behaviour seems right in 1.10, but not in 1.11 and 1.12. --------- Co-authored-by: Viral B. Shah --- test/runtests.jl | 17 +++++++++++++---- test/testgroups | 12 ------------ 2 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 test/testgroups diff --git a/test/runtests.jl b/test/runtests.jl index c515e78d..5819db1a 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -7,13 +7,22 @@ if Base.get_bool_env("SPARSEARRAYS_AQUA_TEST", false) include("ambiguous.jl") end -for file in readlines(joinpath(@__DIR__, "testgroups")) - file == "" && continue # skip empty lines - include(file * ".jl") -end +include("allowscalar.jl") +include("fixed.jl") +include("higherorderfns.jl") +include("sparsematrix_constructors_indexing.jl") +include("sparsematrix_ops.jl") +include("sparsevector.jl") +include("issues.jl") if Base.USE_GPL_LIBS + include("cholmod.jl") + include("umfpack.jl") + include("spqr.jl") + include("linalg.jl") + include("linalg_solvers.jl") + nt = @static if isdefined(Threads, :maxthreadid) Threads.maxthreadid() else diff --git a/test/testgroups b/test/testgroups deleted file mode 100644 index a547762c..00000000 --- a/test/testgroups +++ /dev/null @@ -1,12 +0,0 @@ -allowscalar -cholmod -fixed -higherorderfns -issues -linalg -linalg_solvers -sparsematrix_constructors_indexing -sparsematrix_ops -sparsevector -spqr -umfpack From e545b39596dabb93293f1df3ce9331381020ad4f Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Tue, 25 Nov 2025 10:32:59 -0500 Subject: [PATCH 2/2] Update CI workflow for Julia and checkout action (#659) Updated CI configuration to use actions/checkout@v6 and added macOS-15-intel for macos x86 tests. --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ce5d4ec..1786713e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,11 +30,11 @@ jobs: - os: macOS-latest julia-arch: aarch64 julia-version: '~1.12.0-0' - - os: macOS-13 + - os: macOS-15-intel julia-arch: x64 julia-version: '~1.12.0-0' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} @@ -62,7 +62,7 @@ jobs: julia-arch: - x64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@v2 with: version: ${{ matrix.julia-version }} @@ -75,7 +75,7 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - uses: julia-actions/setup-julia@v2 with: version: '~1.12.0-0'