From 9dd2a148d00b72378efd4e5d0edd5f31313f82ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20P=C3=B6schel?= Date: Thu, 6 Jun 2024 15:41:29 +0200 Subject: [PATCH] Seems we need the MPI workaround for Conda now too..... --- .github/workflows/linux.yml | 3 ++- .github/workflows/mpirun_workaround.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 26eed48da1..b3d5ff32e4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -316,7 +316,8 @@ jobs: -DopenPMD_USE_MPI=ON \ -DopenPMD_USE_HDF5=ON \ -DopenPMD_USE_ADIOS2=ON \ - -DopenPMD_USE_INVASIVE_TESTS=ON + -DopenPMD_USE_INVASIVE_TESTS=ON \ + -DMPIEXEC_EXECUTABLE=".github/workflows/mpirun_workaround.sh" cmake --build build --parallel 2 cd build ctest --output-on-failure diff --git a/.github/workflows/mpirun_workaround.sh b/.github/workflows/mpirun_workaround.sh index cae5a9e791..6c2440a3aa 100755 --- a/.github/workflows/mpirun_workaround.sh +++ b/.github/workflows/mpirun_workaround.sh @@ -14,7 +14,7 @@ # This script provides a workaround by putting the called sub-command into # a script in a temporary file. -mpiexec -n 1 ls --all \ +mpiexec -n 1 ls -l \ && echo "MPIRUN WORKING AGAIN, PLEASE REMOVE WORKAROUND" >&2 \ && exit 1 \ || true