Merge pull request #1997 from mccode-dev/CI-enable-openmpi-v5-macOS

Install mcpl via pip in nightlies

Author: willend

.github/workflows/mcstas-testsuite.yml

@@ -106,7 +106,7 @@ jobs:
                -DMCCODE_USE_LEGACY_DESTINATIONS=OFF \
                -DBUILD_TOOLS=ON \
                -DENABLE_COMPONENTS=ON \
-               -DENSURE_MCPL=ON \
+               -DENSURE_MCPL=OFF \
                -DENSURE_NCRYSTAL=OFF \
                -DENABLE_CIF2HKL=OFF \
                -DENABLE_NEUTRONICS=OFF \
@@ -122,8 +122,6 @@ jobs:
              cd ../install_mcstas/
              TOPDIR=`cygpath -m $PWD`
              cd -
-             sed 's+@CPACK_NSIS_INSTALL_ROOT@+'${TOPDIR}'+g' ../src/3rdparty/mcpl-package/batches/mcpl-config.bat.in > ../install_mcstas/bin/mcpl-config.bat
-             cat ../install_mcstas/bin/mcpl-config.bat
            fi
            test -f "../install_mcstas/bin/${MCSTAS_EXECUTABLE}"
            test -f "../install_mcstas/bin/${MCRUN_EXECUTABLE}"
@@ -144,15 +142,15 @@ jobs:
            set -x
            if [ "$RUNNER_OS" == "Windows" ];
            then
-             python3 -mpip install PyYAML ply McStasscript ncrystal
+             python3 -mpip install PyYAML ply McStasscript ncrystal mcpl
            fi
            if [ "$RUNNER_OS" == "macOS" ];
            then
              python3 -mpip install PyYAML ply McStasScript ncrystal --break-system-packages
            fi
            if [ "$RUNNER_OS" == "Linux" ];
            then
-             python3 -mpip install PyYAML ply McStasscript ncrystal
+             python3 -mpip install PyYAML ply McStasscript ncrystal mcpl
            fi
 
     - name: Test suite, up to 2-core MPI

.github/workflows/mcxtrace-testsuite.yml

@@ -108,7 +108,7 @@ jobs:
                -DMCCODE_USE_LEGACY_DESTINATIONS=OFF \
                -DBUILD_TOOLS=ON \
                -DENABLE_COMPONENTS=ON \
-               -DENSURE_MCPL=ON \
+               -DENSURE_MCPL=OFF \
                -DENSURE_NCRYSTAL=OFF \
                -DENABLE_CIF2HKL=OFF \
                -DENABLE_NEUTRONICS=OFF \
@@ -124,8 +124,6 @@ jobs:
              cd ../install_mcxtrace/
              TOPDIR=`cygpath -m $PWD`
              cd -
-             sed 's+@CPACK_NSIS_INSTALL_ROOT@+'${TOPDIR}'+g' ../src/3rdparty/mcpl-package/batches/mcpl-config.bat.in > ../install_mcxtrace/bin/mcpl-config.bat
-             cat ../install_mcxtrace/bin/mcpl-config.bat
            fi
            test -f "../install_mcxtrace/bin/${MCXTRACE_EXECUTABLE}"
            test -f "../install_mcxtrace/bin/${MXRUN_EXECUTABLE}"
@@ -146,15 +144,15 @@ jobs:
            set -x
            if [ "$RUNNER_OS" == "Windows" ];
            then
-             python3 -mpip install PyYAML ply McStasscript
+             python3 -mpip install PyYAML ply McStasscript mcpl
            fi
            if [ "$RUNNER_OS" == "macOS" ];
            then
-             python3 -mpip install PyYAML ply McStasScript --break-system-packages
+             python3 -mpip install PyYAML ply McStasScript mcpl --break-system-packages
            fi
            if [ "$RUNNER_OS" == "Linux" ];
            then
-             python3 -mpip install PyYAML ply McStasscript
+             python3 -mpip install PyYAML ply McStasscript mcpl
            fi
 
     - name: Test suite, up to 2-core MPI