Skip to content

Commit 9eadf40

Browse files
willendwillend
authored
Merge pull request #2001 from mccode-dev/willend-patch-3
Should make a few more instruments run correctly in the nightlies
2 parents c72c0d3 + 353b07a commit 9eadf40

10 files changed

Lines changed: 81 additions & 38 deletions

‎.github/workflows/mcstas-autobuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ jobs:
114114

115115
- name: Setup tmate session for manual debugging
116116
uses: mxschmitt/action-tmate@v3
117-
if: always() && (inputs.manual-debugging == true && steps.tar-package.outcome != 'success')
117+
if: always() && (inputs.manual-debugging)
118118
with:
119119
limit-access-to-actor: true

‎.github/workflows/mcstas-basictest.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
- { os: macos-13, CC: clang, CXX: clang++, python: "3.11", mpi: 'mpich' }
2626
- { os: macos-14, CC: clang, CXX: clang++, python: "3.12", mpi: 'mpich' }
2727
- { os: macos-15, CC: clang, CXX: clang++, python: "3.13", mpi: 'mpich' }
28-
- { os: macos-13, CC: clang, CXX: clang++, python: "3.11", mpi: 'openmpi' }
28+
#- { os: macos-13, CC: clang, CXX: clang++, python: "3.11", mpi: 'openmpi' }
2929
#- { os: macos-14, CC: clang, CXX: clang++, python: "3.12", mpi: 'openmpi' }
30-
- { os: macos-15, CC: clang, CXX: clang++, python: "3.13", mpi: 'openmpi' }
30+
#- { os: macos-15, CC: clang, CXX: clang++, python: "3.13", mpi: 'openmpi' }
3131
#- { os: windows-latest, CC: gcc, CXX: g++, python: "3.12", mpi: 'msmpi' }
3232

3333
name: ${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}
@@ -59,7 +59,7 @@ jobs:
5959
id: setup-flex-bison-macos
6060
if: runner.os == 'macOS'
6161
run: |
62-
brew install bison flex
62+
brew install bison flex gfortran gsl
6363
6464
- name: Setup Bison (Windows)
6565
id: setup-flex-bison-Windows
@@ -75,8 +75,6 @@ jobs:
7575
python3 --version
7676
which cmake
7777
cmake --version
78-
#NB: bison and flex in path are actually too old, on mac we
79-
#inject these via a brew keg later
8078
8179
- name: Configure build and install mcstas
8280
id: mcstas-install
@@ -89,9 +87,9 @@ jobs:
8987
mkdir build_mcstas
9088
cd build_mcstas
9189
export EXTRA_ARGS_FOR_CMAKE=""
92-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; fi
93-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; fi
94-
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex"; fi
90+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/opt/homebrew/lib -I/opt/homebrew/include"; fi
91+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/usr/local/lib -I/usr/local/include"; fi
92+
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex -DCMAKE_Fortran_COMPILER=${HOMEBRW}/gfortran/bin/gfortran"; fi
9593
if [ "$RUNNER_OS" == "Linux" ]; then export EXTRA_ARGS_FOR_CMAKE="-DNEXUSLIB=/usr/lib -DNEXUSINCLUDE=/usr/include/nexus"; fi
9694
if [ "$RUNNER_OS" == "Windows" ]; then export MPIINC=`cygpath -m -s "${MSMPI_INC}"`; export MPILIB=`cygpath -m -s "${MSMPI_LIB64}"`; export EXTRA_ARGS_FOR_CMAKE="-DMPILIBDIR=${MPILIB} -DMPIINCLUDEDIR=${MPIINC}"; fi
9795
cmake \
@@ -109,7 +107,7 @@ jobs:
109107
-DENABLE_COMPONENTS=ON \
110108
-DENSURE_MCPL=OFF \
111109
-DENSURE_NCRYSTAL=OFF \
112-
-DENABLE_CIF2HKL=OFF \
110+
-DENABLE_CIF2HKL=ON \
113111
-DENABLE_NEUTRONICS=OFF \
114112
${EXTRA_ARGS_FOR_CMAKE}
115113
cmake --build . --config Release
@@ -126,6 +124,7 @@ jobs:
126124
test -f "../install_mcstas/share/mcstas/tools/Python/mccodelib/__init__.py"
127125
test -d "../install_mcstas/share/mcstas/resources/data"
128126
if [ "${{ matrix.mpi }}" == "openmpi" ]; then sed -i.bak 's/mpirun/mpirun\ --verbose\ --mca\ btl\ self,vader,tcp/g' ../install_mcstas/share/mcstas/tools/Python/mccodelib/mccode_config.json ; fi
127+
if [ "$RUNNER_OS" == "macOS" ]; then sed -i.bak "s+-lgsl\ -lgslcblas+${GSLFLAGS}+g" ../install_mcstas/share/mcstas/tools/Python/mccodelib/mccode_config.json ; fi
129128
echo *******************************************************************************
130129
echo Resulting mccode_config.json:
131130
echo *******************************************************************************
@@ -365,6 +364,6 @@ jobs:
365364

366365
- name: Setup tmate session for manual debugging
367366
uses: mxschmitt/action-tmate@v3
368-
if: always() && (inputs.manual-debugging == true && steps.tar-package.outcome != 'success')
367+
if: always() && (inputs.manual-debugging == true)
369368
with:
370369
limit-access-to-actor: true

‎.github/workflows/mcstas-testsuite.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ jobs:
8888
mkdir build_mcstas
8989
cd build_mcstas
9090
export EXTRA_ARGS_FOR_CMAKE=""
91-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; fi
92-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; fi
93-
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex"; fi
91+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/opt/homebrew/lib -I/opt/homebrew/include"; fi
92+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/usr/local/lib -I/usr/local/include"; fi
93+
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex -DCMAKE_Fortran_COMPILER=${HOMEBRW}/gfortran/bin/gfortran"; fi
9494
if [ "$RUNNER_OS" == "Linux" ]; then export EXTRA_ARGS_FOR_CMAKE="-DNEXUSLIB=/usr/lib -DNEXUSINCLUDE=/usr/include/nexus"; fi
95-
if [ "$RUNNER_OS" == "Windows" ]; then export MPIINC=`cygpath -m -s "${MSMPI_INC}"`; export MPILIB=`cygpath -m -s "${MSMPI_LIB64}"`; export EXTRA_ARGS_FOR_CMAKE="-DMPILIBDIR=${MPILIB} -DMPIINCLUDEDIR=${MPIINC}"; fi
95+
if [ "$RUNNER_OS" == "Windows" ]; then export MPIINC=`cygpath -m -s "${MSMPI_INC}"`; export MPILIB=`cygpath -m -s "${MSMPI_LIB64}"`; export EXTRA_ARGS_FOR_CMAKE="-DMPILIBDIR=${MPILIB} -DMPIINCLUDEDIR=${MPIINC} -DMCCODE_BUILD_WINDOWS_MINGW=ON"; fi
9696
cmake \
9797
-DCMAKE_INSTALL_PREFIX=../install_mcstas \
9898
-S ../src \
@@ -108,7 +108,7 @@ jobs:
108108
-DENABLE_COMPONENTS=ON \
109109
-DENSURE_MCPL=OFF \
110110
-DENSURE_NCRYSTAL=OFF \
111-
-DENABLE_CIF2HKL=OFF \
111+
-DENABLE_CIF2HKL=ON \
112112
-DENABLE_NEUTRONICS=OFF \
113113
${EXTRA_ARGS_FOR_CMAKE}
114114
cmake --build . --config Release
@@ -127,7 +127,8 @@ jobs:
127127
test -f "../install_mcstas/bin/${MCRUN_EXECUTABLE}"
128128
test -f "../install_mcstas/share/mcstas/tools/Python/mccodelib/__init__.py"
129129
test -d "../install_mcstas/share/mcstas/resources/data"
130-
if [ "${{ matrix.mpi }}" == "openmpi" ]; then sed -i.bak 's/mpirun/mpirun\ --mca\ btl\ self,vader,tcp/g' ../install_mcstas/share/mcstas/tools/Python/mccodelib/mccode_config.json ; fi
130+
if [ "${{ matrix.mpi }}" == "openmpi" ]; then sed -i.bak 's/mpirun/mpirun\ --verbose\ --mca\ btl\ self,vader,tcp/g' ../install_mcstas/share/mcstas/tools/Python/mccodelib/mccode_config.json ; fi
131+
if [ "$RUNNER_OS" == "macOS" ]; then sed -i.bak "s+-lgsl\ -lgslcblas+${GSLFLAGS}+g" ../install_mcstas/share/mcstas/tools/Python/mccodelib/mccode_config.json ; fi
131132
echo *******************************************************************************
132133
echo Resulting mccode_config.json:
133134
echo *******************************************************************************
@@ -146,7 +147,7 @@ jobs:
146147
fi
147148
if [ "$RUNNER_OS" == "macOS" ];
148149
then
149-
python3 -mpip install PyYAML ply McStasScript ncrystal --break-system-packages
150+
python3 -mpip install PyYAML ply McStasScript ncrystal mcpl --break-system-packages
150151
fi
151152
if [ "$RUNNER_OS" == "Linux" ];
152153
then
@@ -193,6 +194,6 @@ jobs:
193194

194195
- name: Setup tmate session for manual debugging
195196
uses: mxschmitt/action-tmate@v3
196-
if: always() && (inputs.manual-debugging == true && steps.tar-package.outcome != 'success')
197+
if: always() && (inputs.manual-debugging == true)
197198
with:
198199
limit-access-to-actor: true

‎.github/workflows/mcstas-winbasictest-mingw.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: mcstas-mingw-winbasictest
33
on:
44
push:
55
pull_request:
6+
schedule:
7+
- cron: '55 23 * * 0' # 23:55 every Sunday
68

79
jobs:
810
build:
@@ -72,7 +74,7 @@ jobs:
7274
-DMCCODE_USE_LEGACY_DESTINATIONS=OFF
7375
-DBUILD_TOOLS=ON
7476
-DENABLE_COMPONENTS=ON
75-
-DENABLE_CIF2HKL=OFF
77+
-DENABLE_CIF2HKL=ON
7678
-DENABLE_NEUTRONICS=OFF
7779
-DMPIINCLUDEDIR=%MPIINCVAR%
7880
-DMPILIBDIR=%MPILIBVAR%
@@ -203,3 +205,9 @@ jobs:
203205
with:
204206
name: mcstas-mingw-${{ matrix.os }}_output.tgz
205207
path: "mcstas-mingw-${{ matrix.os }}_output.tgz"
208+
209+
- name: Setup tmate session for manual debugging
210+
uses: mxschmitt/action-tmate@v3
211+
if: always() && (inputs.manual-debugging == true)
212+
with:
213+
limit-access-to-actor: true

‎.github/workflows/mcstas-winbasictest-msvc.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: mcstas-msvc-winbasictest
33
on:
44
push:
55
pull_request:
6+
schedule:
7+
- cron: '55 23 * * 0' # 23:55 every Sunday
68

79
jobs:
810
build:
@@ -228,3 +230,9 @@ jobs:
228230
with:
229231
name: mcstas-msvc-${{ matrix.os }}_output.tgz
230232
path: "mcstas-msvc-${{ matrix.os }}_output.tgz"
233+
234+
- name: Setup tmate session for manual debugging
235+
uses: mxschmitt/action-tmate@v3
236+
if: always() && (inputs.manual-debugging == true)
237+
with:
238+
limit-access-to-actor: true

‎.github/workflows/mcxtrace-autobuild.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ jobs:
114114

115115
- name: Setup tmate session for manual debugging
116116
uses: mxschmitt/action-tmate@v3
117-
if: always() && (inputs.manual-debugging == true && steps.tar-package.outcome != 'success')
117+
if: always() && (inputs.manual-debugging)
118118
with:
119119
limit-access-to-actor: true

‎.github/workflows/mcxtrace-basictest.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
- { os: macos-13, CC: clang, CXX: clang++, python: "3.11", mpi: 'mpich' }
2626
- { os: macos-14, CC: clang, CXX: clang++, python: "3.12", mpi: 'mpich' }
2727
- { os: macos-15, CC: clang, CXX: clang++, python: "3.13", mpi: 'mpich' }
28-
- { os: macos-13, CC: clang, CXX: clang++, python: "3.11", mpi: 'openmpi' }
28+
#- { os: macos-13, CC: clang, CXX: clang++, python: "3.11", mpi: 'openmpi' }
2929
#- { os: macos-14, CC: clang, CXX: clang++, python: "3.12", mpi: 'openmpi' }
30-
- { os: macos-15, CC: clang, CXX: clang++, python: "3.13", mpi: 'openmpi' }
30+
#- { os: macos-15, CC: clang, CXX: clang++, python: "3.13", mpi: 'openmpi' }
3131
#- { os: windows-latest, CC: gcc, CXX: g++, python: "3.12", mpi: 'msmpi' }
3232

3333
name: ${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}
@@ -59,7 +59,9 @@ jobs:
5959
id: setup-flex-bison-macos
6060
if: runner.os == 'macOS'
6161
run: |
62-
brew install bison flex
62+
brew install bison flex gfortran gsl
63+
brew tap tschoonj/tap
64+
brew install xraylib
6365
6466
- name: Setup Bison (Windows)
6567
id: setup-flex-bison-Windows
@@ -75,8 +77,6 @@ jobs:
7577
python3 --version
7678
which cmake
7779
cmake --version
78-
#NB: bison and flex in path are actually too old, on mac we
79-
#inject these via a brew keg later
8080
8181
- name: Configure build and install mcxtrace
8282
id: mcxtrace-install
@@ -89,9 +89,9 @@ jobs:
8989
mkdir build_mcxtrace
9090
cd build_mcxtrace
9191
export EXTRA_ARGS_FOR_CMAKE=""
92-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; fi
93-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; fi
94-
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex"; fi
92+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/opt/homebrew/lib -I/opt/homebrew/include"; export XRLFLAGS="-lxrl -L/opt/homebrew/lib -I/opt/homebrew/include"; fi
93+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/usr/local/lib -I/usr/local/include"; export XRLFLAGS="-lxrl -L/usr/local/lib -I/usr/local/include"; fi
94+
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex -DCMAKE_Fortran_COMPILER=${HOMEBRW}/gfortran/bin/gfortran"; fi
9595
if [ "$RUNNER_OS" == "Linux" ]; then export EXTRA_ARGS_FOR_CMAKE="-DNEXUSLIB=/usr/lib -DNEXUSINCLUDE=/usr/include/nexus"; fi
9696
if [ "$RUNNER_OS" == "Windows" ]; then export MPIINC=`cygpath -m -s "${MSMPI_INC}"`; export MPILIB=`cygpath -m -s "${MSMPI_LIB64}"`; export EXTRA_ARGS_FOR_CMAKE="-DMPILIBDIR=${MPILIB} -DMPIINCLUDEDIR=${MPIINC}"; fi
9797
cmake \
@@ -109,7 +109,7 @@ jobs:
109109
-DENABLE_COMPONENTS=ON \
110110
-DENSURE_MCPL=OFF \
111111
-DENSURE_NCRYSTAL=OFF \
112-
-DENABLE_CIF2HKL=OFF \
112+
-DENABLE_CIF2HKL=ON \
113113
-DENABLE_NEUTRONICS=OFF \
114114
${EXTRA_ARGS_FOR_CMAKE}
115115
cmake --build . --config Release
@@ -126,6 +126,8 @@ jobs:
126126
test -f "../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/__init__.py"
127127
test -d "../install_mcxtrace/share/mcxtrace/resources/data"
128128
if [ "${{ matrix.mpi }}" == "openmpi" ]; then sed -i.bak 's/mpirun/mpirun\ --mca\ btl\ self,vader,tcp/g' ../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/mccode_config.json ; fi
129+
if [ "$RUNNER_OS" == "macOS" ]; then sed -i.bak "s+-lgsl\ -lgslcblas+${GSLFLAGS}+g" ../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/mccode_config.json ; fi
130+
if [ "$RUNNER_OS" == "macOS" ]; then sed -i.bak "s+-lxrl+${XRLFLAGS}+g" ../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/mccode_config.json ; fi
129131
echo *******************************************************************************
130132
echo Resulting mccode_config.json:
131133
echo *******************************************************************************
@@ -292,6 +294,6 @@ jobs:
292294

293295
- name: Setup tmate session for manual debugging
294296
uses: mxschmitt/action-tmate@v3
295-
if: always() && (inputs.manual-debugging == true && steps.tar-package.outcome != 'success')
297+
if: always() && (inputs.manual-debugging == true)
296298
with:
297299
limit-access-to-actor: true

‎.github/workflows/mcxtrace-testsuite.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,17 @@ jobs:
6060
- name: Setup Windows
6161
id: setup-Windows
6262
if: runner.os == 'Windows'
63+
#shell: cmd
6364
run: |
6465
choco install winflexbison3
66+
choco install wget
6567
pip install mslex
6668
69+
# In princple we could (maybe?) test with xraylib, but it
70+
# seems their installer does not include headers...
71+
#wget https://github.com/tschoonj/xraylib/releases/download/xraylib-4.1.5/xraylib-4.1.5-win64.exe
72+
#xraylib-4.1.5-win64.exe /VERYSILENT /SUPPRESSMSGBOXES
73+
6774
- name: Setup Linux
6875
id: setup-Linux
6976
if: runner.os == 'Linux'
@@ -90,11 +97,11 @@ jobs:
9097
mkdir build_mcxtrace
9198
cd build_mcxtrace
9299
export EXTRA_ARGS_FOR_CMAKE=""
93-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; fi
94-
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; fi
95-
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex"; fi
100+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/opt/homebrew/opt/flex/bin/flex" ]; then export HOMEBRW="/opt/homebrew/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/opt/homebrew/lib -I/opt/homebrew/include"; export XRLFLAGS="-lxrl -L/opt/homebrew/lib -I/opt/homebrew/include"; fi
101+
if [ "$RUNNER_OS" == "macOS" ] && [ -f "/usr/local/opt/flex/bin/flex" ]; then export HOMEBRW="/usr/local/opt"; export GSLFLAGS="-lgsl -lgslcblas -L/usr/local/lib -I/usr/local/include"; export XRLFLAGS="-lxrl -L/usr/local/lib -I/usr/local/include"; fi
102+
if [ "$RUNNER_OS" == "macOS" ]; then export EXTRA_ARGS_FOR_CMAKE="-DBISON_EXECUTABLE=${HOMEBRW}/bison/bin/bison -DFLEX_EXECUTABLE=${HOMEBRW}/flex/bin/flex -DCMAKE_Fortran_COMPILER=${HOMEBRW}/gfortran/bin/gfortran"; fi
96103
if [ "$RUNNER_OS" == "Linux" ]; then export EXTRA_ARGS_FOR_CMAKE="-DNEXUSLIB=/usr/lib -DNEXUSINCLUDE=/usr/include/nexus"; fi
97-
if [ "$RUNNER_OS" == "Windows" ]; then export MPIINC=`cygpath -m -s "${MSMPI_INC}"`; export MPILIB=`cygpath -m -s "${MSMPI_LIB64}"`; export EXTRA_ARGS_FOR_CMAKE="-DMPILIBDIR=${MPILIB} -DMPIINCLUDEDIR=${MPIINC}"; fi
104+
if [ "$RUNNER_OS" == "Windows" ]; then export MPIINC=`cygpath -m -s "${MSMPI_INC}"`; export MPILIB=`cygpath -m -s "${MSMPI_LIB64}"`; export EXTRA_ARGS_FOR_CMAKE="-DMPILIBDIR=${MPILIB} -DMPIINCLUDEDIR=${MPIINC} -DMCCODE_BUILD_WINDOWS_MINGW=ON"; fi
98105
cmake \
99106
-DCMAKE_INSTALL_PREFIX=../install_mcxtrace \
100107
-S ../src \
@@ -110,7 +117,7 @@ jobs:
110117
-DENABLE_COMPONENTS=ON \
111118
-DENSURE_MCPL=OFF \
112119
-DENSURE_NCRYSTAL=OFF \
113-
-DENABLE_CIF2HKL=OFF \
120+
-DENABLE_CIF2HKL=ON \
114121
-DENABLE_NEUTRONICS=OFF \
115122
${EXTRA_ARGS_FOR_CMAKE}
116123
cmake --build . --config Release
@@ -130,6 +137,8 @@ jobs:
130137
test -f "../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/__init__.py"
131138
test -d "../install_mcxtrace/share/mcxtrace/resources/data"
132139
if [ "${{ matrix.mpi }}" == "openmpi" ]; then sed -i.bak 's/mpirun/mpirun\ --mca\ btl\ self,vader,tcp/g' ../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/mccode_config.json ; fi
140+
if [ "$RUNNER_OS" == "macOS" ]; then sed -i.bak "s+-lgsl\ -lgslcblas+${GSLFLAGS}+g" ../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/mccode_config.json ; fi
141+
if [ "$RUNNER_OS" == "macOS" ]; then sed -i.bak "s+-lxrl+${XRLFLAGS}+g" ../install_mcxtrace/share/mcxtrace/tools/Python/mccodelib/mccode_config.json ; fi
133142
echo *******************************************************************************
134143
echo Resulting mccode_config.json:
135144
echo *******************************************************************************
@@ -195,6 +204,6 @@ jobs:
195204

196205
- name: Setup tmate session for manual debugging
197206
uses: mxschmitt/action-tmate@v3
198-
if: always() && (inputs.manual-debugging == true && steps.tar-package.outcome != 'success')
207+
if: always() && (inputs.manual-debugging == true)
199208
with:
200209
limit-access-to-actor: true

0 commit comments

Comments
 (0)