File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ jobs:
106106 -DMCCODE_USE_LEGACY_DESTINATIONS=OFF \
107107 -DBUILD_TOOLS=ON \
108108 -DENABLE_COMPONENTS=ON \
109- -DENSURE_MCPL=ON \
109+ -DENSURE_MCPL=OFF \
110110 -DENSURE_NCRYSTAL=OFF \
111111 -DENABLE_CIF2HKL=OFF \
112112 -DENABLE_NEUTRONICS=OFF \
@@ -122,8 +122,6 @@ jobs:
122122 cd ../install_mcstas/
123123 TOPDIR=`cygpath -m $PWD`
124124 cd -
125- sed 's+@CPACK_NSIS_INSTALL_ROOT@+'${TOPDIR}'+g' ../src/3rdparty/mcpl-package/batches/mcpl-config.bat.in > ../install_mcstas/bin/mcpl-config.bat
126- cat ../install_mcstas/bin/mcpl-config.bat
127125 fi
128126 test -f "../install_mcstas/bin/${MCSTAS_EXECUTABLE}"
129127 test -f "../install_mcstas/bin/${MCRUN_EXECUTABLE}"
@@ -144,15 +142,15 @@ jobs:
144142 set -x
145143 if [ "$RUNNER_OS" == "Windows" ];
146144 then
147- python3 -mpip install PyYAML ply McStasscript ncrystal
145+ python3 -mpip install PyYAML ply McStasscript ncrystal mcpl
148146 fi
149147 if [ "$RUNNER_OS" == "macOS" ];
150148 then
151149 python3 -mpip install PyYAML ply McStasScript ncrystal --break-system-packages
152150 fi
153151 if [ "$RUNNER_OS" == "Linux" ];
154152 then
155- python3 -mpip install PyYAML ply McStasscript ncrystal
153+ python3 -mpip install PyYAML ply McStasscript ncrystal mcpl
156154 fi
157155
158156 - name : Test suite, up to 2-core MPI
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ jobs:
108108 -DMCCODE_USE_LEGACY_DESTINATIONS=OFF \
109109 -DBUILD_TOOLS=ON \
110110 -DENABLE_COMPONENTS=ON \
111- -DENSURE_MCPL=ON \
111+ -DENSURE_MCPL=OFF \
112112 -DENSURE_NCRYSTAL=OFF \
113113 -DENABLE_CIF2HKL=OFF \
114114 -DENABLE_NEUTRONICS=OFF \
@@ -124,8 +124,6 @@ jobs:
124124 cd ../install_mcxtrace/
125125 TOPDIR=`cygpath -m $PWD`
126126 cd -
127- sed 's+@CPACK_NSIS_INSTALL_ROOT@+'${TOPDIR}'+g' ../src/3rdparty/mcpl-package/batches/mcpl-config.bat.in > ../install_mcxtrace/bin/mcpl-config.bat
128- cat ../install_mcxtrace/bin/mcpl-config.bat
129127 fi
130128 test -f "../install_mcxtrace/bin/${MCXTRACE_EXECUTABLE}"
131129 test -f "../install_mcxtrace/bin/${MXRUN_EXECUTABLE}"
@@ -146,15 +144,15 @@ jobs:
146144 set -x
147145 if [ "$RUNNER_OS" == "Windows" ];
148146 then
149- python3 -mpip install PyYAML ply McStasscript
147+ python3 -mpip install PyYAML ply McStasscript mcpl
150148 fi
151149 if [ "$RUNNER_OS" == "macOS" ];
152150 then
153- python3 -mpip install PyYAML ply McStasScript --break-system-packages
151+ python3 -mpip install PyYAML ply McStasScript mcpl --break-system-packages
154152 fi
155153 if [ "$RUNNER_OS" == "Linux" ];
156154 then
157- python3 -mpip install PyYAML ply McStasscript
155+ python3 -mpip install PyYAML ply McStasscript mcpl
158156 fi
159157
160158 - name : Test suite, up to 2-core MPI
You can’t perform that action at this time.
0 commit comments