From bea7d0a2b81be2166a25b582e91177f656128d66 Mon Sep 17 00:00:00 2001 From: Boris Kaus Date: Tue, 15 Oct 2024 19:07:48 +0200 Subject: [PATCH] deactivate all tests (for now); try setting up ci like MPI.jl --- .github/workflows/ci.yml | 32 +++++++++++++++++++++++--------- test/runtests.jl | 11 +++++++++-- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 17eabcfb..01ac5baf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,12 @@ on: tags: '*' pull_request: +concurrency: + # Skip intermediate builds: always. + # Cancel intermediate builds: always. + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: test: name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} @@ -17,16 +23,11 @@ jobs: matrix: version: - 'lts' - - '1.11' + #- '1.11' os: - - ubuntu-latest - - windows-latest - arch: - - x64 - include: - os: macOS-latest - arch: aarch64 - version: 'lts' + #- ubuntu-latest + #- windows-latest steps: - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v2 @@ -43,5 +44,18 @@ jobs: ${{ runner.os }}-test-${{ env.cache-name }}- ${{ runner.os }}-test- ${{ runner.os }}- - - uses: julia-actions/julia-buildpkg@latest + - name: add MPIPreferences + shell: julia --color=yes --project=. {0} + run: | + using Pkg + Pkg.develop(path="lib/MPIPreferences") + #- uses: julia-actions/julia-buildpkg@latest + - name: use OpenMPI_jll + shell: julia --color=yes --project=test {0} + run: | + using Pkg + Pkg.develop(path="lib/MPIPreferences") + using MPIPreferences + MPIPreferences.use_jll_binary("MPICH_jll", export_prefs=true) + rm("test/Manifest.toml") - uses: julia-actions/julia-runtest@latest diff --git a/test/runtests.jl b/test/runtests.jl index db833748..443dbecd 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,9 +1,16 @@ using Test using MPI + +do_mpi = true +if Sys.iswindows() + do_mpi = false +end + + # Do the MPI tests first so we do not have mpi running inside MPI # XXX: Currently not working on windows, not sure why -if !Sys.iswindows() +if do_mpi cmd = `$(mpiexec()) -n 4 $(Base.julia_cmd()) --project dmda.jl` run(cmd) success(pipeline(cmd, stderr = stderr)) @@ -13,7 +20,7 @@ end # # INCLUDE IN MPI TEST # will be run here # XXX: Currently not working on windows reliably, not sure why -if !Sys.iswindows() +if do_mpi include("mpi_examples.jl") end