From 8bc45937464eab75c559d9b68138478362e5ea54 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 10:34:22 +0200 Subject: [PATCH 01/12] Correct typo in tar filename, remove double 'comp' entry in suffix --- .github/workflows/mcstas-basictest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index 299598b57..04151dc74 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -431,7 +431,7 @@ jobs: NUMMATCH=`find src/mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES_${comp}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } else echo No matching tests found fi @@ -473,7 +473,7 @@ jobs: set -x # Clear out binaries from sim dir and tar up artifact ls | grep run_ | xargs -n1 ./src/devel/bin/mccode-simdir-cleanfiles -d - tar cvfz mmcstas-${{ matrix.cogen }}.${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}_output.tgz run_* + tar cvfz mcstas-${{ matrix.cogen }}.${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}_output.tgz run_* - name: 'Upload Artifact' id: tar-upload From a6105b3fb96947b5f2b0ef4f8a1784f3864de15f Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 12:57:05 +0200 Subject: [PATCH 02/12] Correct artefact label... --- .github/workflows/mcstas-basictest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index 04151dc74..fc8651160 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -481,7 +481,7 @@ jobs: if: always() with: name: mcstas-artefacts-${{ matrix.cogen }}.${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }} - path: "mmcstas-${{ matrix.cogen }}.${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}_output.tgz" + path: "mcstas-${{ matrix.cogen }}.${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}_output.tgz" - name: Setup tmate session for manual debugging uses: mxschmitt/action-tmate@v3 From 196959c2e74445409f08ca55cc6caa62dc1be336 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 12:58:18 +0200 Subject: [PATCH 03/12] Different lables om COMP and INSTR changes --- .github/workflows/mcstas-basictest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index fc8651160..1b64ed293 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -431,7 +431,7 @@ jobs: NUMMATCH=`find src/mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_compCHANGES_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } else echo No matching tests found fi @@ -460,7 +460,7 @@ jobs: export SCOPE=" " fi mkdir -p run_mctest && cd run_mctest - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } ${MCVIEWTEST_EXECUTABLE} --nobrowse $PWD fi From 72e79206fea6dac06eebb8e6ca325269b510c00a Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 14:38:00 +0200 Subject: [PATCH 04/12] Add an 'index' in test label pr. changed comp --- .github/workflows/mcstas-basictest.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index 1b64ed293..668b16a13 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -423,6 +423,7 @@ jobs: export CHANGEDCOMPS=`git diff --name-only $DIFFBASE HEAD | grep \.comp\$ | grep mcstas-comps | xargs -n1 basename | sed s/\.comp//g | sort | uniq | xargs echo` export NUMCHANGEDCOMPS=`git diff --name-only $DIFFBASE HEAD | grep \.comp\$ | grep mcstas-comps | wc -l | xargs echo` cd - + compindex=0 if [ "$NUMCHANGEDCOMPS" != "0" ]; then for comp in $CHANGEDCOMPS; @@ -431,7 +432,8 @@ jobs: NUMMATCH=`find src/mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_compCHANGES_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_comp_CHANGES_${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + compindex=$(( compindex+1 )) else echo No matching tests found fi From 4d14dc063037afc5683c0cf3d5bf78cbb9de772c Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 15:00:22 +0200 Subject: [PATCH 05/12] Spare a few more chars... --- .github/workflows/mcstas-basictest.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index 668b16a13..0c0158dc0 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -25,7 +25,7 @@ jobs: - { method: conda, os: ubuntu-latest, CC: gcc, CXX: g++, python: '3.13', mpi: 'openmpi', nmpi: 'auto', cogen: 'classic'} - { method: conda, os: ubuntu-latest, CC: gcc, CXX: g++, python: '3.13', mpi: 'openmpi', nmpi: 'auto', cogen: 'antlr'} - { method: conda, os: macos-latest, CC: clang, CXX: clang++, python: '3.13', mpi: 'openmpi', nmpi: '2', cogen: 'classic'} - - { method: conda, os: windows-latest, CC: cl.exe, CXX: cl.exe, python: "3.13", mpi: 'msmpi', nmpi: 'auto', cogen: 'classic'} + - { method: conda, os: windows-latest, CC: CL, CXX: CL, python: "3.13", mpi: 'msmpi', nmpi: 'auto', cogen: 'classic'} name: ${{ matrix.os }}.${{ matrix.method }}.${{ matrix.cogen }}.${{ matrix.CC || 'default' }}.${{ matrix.mpi }} runs-on: ${{ matrix.os }} @@ -133,7 +133,7 @@ jobs: - name: Configure build and install mcstas (source) id: mcstas-install - if: ${{ matrix.method == 'source' && matrix.CC != 'cl.exe' }} + if: ${{ matrix.method == 'source' && matrix.CC != 'CL' }} run: | if [ "$RUNNER_OS" == "macOS" ]; then mkdir ${HOME}/tmp; fi if [ "$RUNNER_OS" == "macOS" ]; then export SDKROOT=$(xcrun --sdk macosx --show-sdk-path); fi @@ -231,7 +231,7 @@ jobs: type .\install_mcstas\share\mcstas\tools\Python\mccodelib\mccode_config.json .\install_mcstas\bin\mcrun -h .\install_mcstas\bin\mcstas -v - if [ "${{ matrix.CC }}" != "cl.exe" ]; + if [ "${{ matrix.CC }}" != "CL" ]; then mcpl-config -s ncrystal-config -s @@ -432,7 +432,7 @@ jobs: NUMMATCH=`find src/mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_comp_CHANGES_${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_compCHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } compindex=$(( compindex+1 )) else echo No matching tests found From a9a6ac8fa45a24980b62ef3a281a48a9e4dfc058 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 15:05:35 +0200 Subject: [PATCH 06/12] Port basictest changes to McXtrace --- .github/workflows/mcxtrace-basictest.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml index 28716ad0a..55b3838c6 100644 --- a/.github/workflows/mcxtrace-basictest.yml +++ b/.github/workflows/mcxtrace-basictest.yml @@ -25,7 +25,7 @@ jobs: - { method: conda, os: ubuntu-latest, CC: gcc, CXX: g++, python: '3.13', mpi: 'openmpi', nmpi: 'auto', cogen: 'classic'} # - { method: conda, os: ubuntu-latest, CC: gcc, CXX: g++, python: '3.13', mpi: 'openmpi', nmpi: 'auto', cogen: 'antlr'} - { method: conda, os: macos-latest, CC: clang, CXX: clang++, python: '3.13', mpi: 'openmpi', nmpi: '2', cogen: 'classic'} - - { method: conda, os: windows-latest, CC: cl.exe, CXX: cl.exe, python: "3.13", mpi: 'msmpi', nmpi: 'auto', cogen: 'classic'} + - { method: conda, os: windows-latest, CC: CL, CXX: CL, python: "3.13", mpi: 'msmpi', nmpi: 'auto', cogen: 'classic'} name: ${{ matrix.os }}.${{ matrix.method }}.${{ matrix.cogen }}.${{ matrix.CC || 'default' }}.${{ matrix.mpi }} runs-on: ${{ matrix.os }} @@ -141,7 +141,7 @@ jobs: - name: Configure build and install mcxtrace (source) id: mcxtrace-install - if: ${{ matrix.method == 'source' && matrix.CC != 'cl.exe' }} + if: ${{ matrix.method == 'source' && matrix.CC != 'CL' }} run: | if [ "$RUNNER_OS" == "macOS" ]; then mkdir ${HOME}/tmp; fi if [ "$RUNNER_OS" == "macOS" ]; then export SDKROOT=$(xcrun --sdk macosx --show-sdk-path); fi @@ -240,7 +240,7 @@ jobs: type .\install_mcxtrace\share\mcxtrace\tools\Python\mccodelib\mccode_config.json .\install_mcxtrace\bin\mxrun -h .\install_mcxtrace\bin\mcxtrace -v - if [ "${{ matrix.CC }}" != "cl.exe" ]; + if [ "${{ matrix.CC }}" != "CL" ]; then mcpl-config -s fi @@ -353,7 +353,7 @@ jobs: fi test -n "$(command -v mcxtrace${EXESUFFIX})" mcxtrace${EXESUFFIX} --version - mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.method }} --uid=${RUNNER_TRACKING_ID} + mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${RUNNER_TRACKING_ID} export SUM=`find run_rngtest -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ ` export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86" if [ "${EXPECTED}" == "${SUM}" ]; @@ -430,6 +430,7 @@ jobs: export CHANGEDCOMPS=`git diff --name-only $DIFFBASE HEAD | grep \.comp\$ | grep mcxtrace-comps | xargs -n1 basename | sed s/\.comp//g | sort | uniq | xargs echo` export NUMCHANGEDCOMPS=`git diff --name-only $DIFFBASE HEAD | grep \.comp\$ | grep mcxtrace-comps | wc -l | xargs echo` cd - + compindex=0 if [ "$NUMCHANGEDCOMPS" != "0" ]; then for comp in $CHANGEDCOMPS; @@ -438,7 +439,8 @@ jobs: NUMMATCH=`find src/mcxtrace-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mxtest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES_${comp}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mxtest --comp=${comp} --suffix=${{ matrix.cogen }}_compCHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + compindex=$(( compindex+1 )) else echo No matching tests found fi @@ -467,7 +469,7 @@ jobs: export SCOPE=" " fi mkdir -p run_mxtest && cd run_mxtest - ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=CHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } ${MXVIEWTEST_EXECUTABLE} --nobrowse $PWD fi From 9246ccebb6158dfc89a1cf0ce8a705d79b5e5f24 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 15:31:03 +0200 Subject: [PATCH 07/12] Shorten path even further... --- .github/workflows/mcstas-basictest.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index 0c0158dc0..de8c0e106 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -346,7 +346,7 @@ jobs: fi test -n "$(command -v mcstas${EXESUFFIX})" mcstas${EXESUFFIX} --version - mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${RUNNER_TRACKING_ID} + mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${GITHUB_RUN_ID} export SUM=`find run_rngtest -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ ` export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86" if [ "${EXPECTED}" == "${SUM}" ]; @@ -374,8 +374,8 @@ jobs: fi test -n "$(command -v mcstas${EXESUFFIX})" mcstas${EXESUFFIX} --version - mctest${SUFFIX} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${RUNNER_TRACKING_ID} - mctest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.mpi }} --uid=${RUNNER_TRACKING_ID} + mctest${SUFFIX} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${GITHUB_RUN_ID} + mctest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} - name: Check for modified instruments id: instr-test @@ -432,7 +432,7 @@ jobs: NUMMATCH=`find src/mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_compCHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } compindex=$(( compindex+1 )) else echo No matching tests found @@ -462,7 +462,7 @@ jobs: export SCOPE=" " fi mkdir -p run_mctest && cd run_mctest - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } ${MCVIEWTEST_EXECUTABLE} --nobrowse $PWD fi From 42cd9508a4f67a5241ad65a2a1107bb90956fe6c Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 15:33:49 +0200 Subject: [PATCH 08/12] Sync changes to mcxtrace-basictest --- .github/workflows/mcxtrace-basictest.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml index 55b3838c6..f65029217 100644 --- a/.github/workflows/mcxtrace-basictest.yml +++ b/.github/workflows/mcxtrace-basictest.yml @@ -353,7 +353,7 @@ jobs: fi test -n "$(command -v mcxtrace${EXESUFFIX})" mcxtrace${EXESUFFIX} --version - mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${RUNNER_TRACKING_ID} + mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${GITHUB_RUN_ID} export SUM=`find run_rngtest -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ ` export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86" if [ "${EXPECTED}" == "${SUM}" ]; @@ -381,8 +381,8 @@ jobs: fi test -n "$(command -v mcxtrace${EXESUFFIX})" mcxtrace${EXESUFFIX} --version - mxtest${SUFFIX} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.method }} --uid=${RUNNER_TRACKING_ID} - mxtest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.mpi }} --uid=${RUNNER_TRACKING_ID} + mxtest${SUFFIX} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.method }} --uid=${GITHUB_RUN_ID} + mxtest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} - name: Check for modified instruments id: instr-test @@ -439,7 +439,7 @@ jobs: NUMMATCH=`find src/mcxtrace-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mxtest --comp=${comp} --suffix=${{ matrix.cogen }}_compCHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mxtest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } compindex=$(( compindex+1 )) else echo No matching tests found @@ -469,7 +469,7 @@ jobs: export SCOPE=" " fi mkdir -p run_mxtest && cd run_mxtest - ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${RUNNER_TRACKING_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } ${MXVIEWTEST_EXECUTABLE} --nobrowse $PWD fi From eedd3d0a6b51ffff727a8c02600a628a99fa0d9f Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 15:35:41 +0200 Subject: [PATCH 09/12] Shorter unique identifier in testsuite workflows --- .github/workflows/mcstas-conda-testsuite.yml | 2 +- .github/workflows/mcxtrace-conda-testsuite.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mcstas-conda-testsuite.yml b/.github/workflows/mcstas-conda-testsuite.yml index 033428b6c..2f740ca2d 100644 --- a/.github/workflows/mcstas-conda-testsuite.yml +++ b/.github/workflows/mcstas-conda-testsuite.yml @@ -126,7 +126,7 @@ jobs: export TMPDIR=${HOME}/tmp fi # Run the test with 2 core mpi - ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.cogen }}_${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${RUNNER_TRACKING_ID} + ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.cogen }}_${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${GITHUB_RUN_ID} - name: 'Tar output files' id: tar-package if: always() diff --git a/.github/workflows/mcxtrace-conda-testsuite.yml b/.github/workflows/mcxtrace-conda-testsuite.yml index 9470e7e57..b6a418335 100644 --- a/.github/workflows/mcxtrace-conda-testsuite.yml +++ b/.github/workflows/mcxtrace-conda-testsuite.yml @@ -107,7 +107,7 @@ jobs: export TMPDIR=${HOME}/tmp fi # Run the test with 2 core mpi - ${MXTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${RUNNER_TRACKING_ID} + ${MXTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${GITHUB_RUN_ID} - name: 'Tar output files' id: tar-package From abed8b5ce54c1dc9b7c540e413cef9bdc31b52ce Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 16:49:48 +0200 Subject: [PATCH 10/12] Add $CC in basictest label --- .github/workflows/mcstas-basictest.yml | 4 ++-- .github/workflows/mcxtrace-basictest.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index de8c0e106..2366e62db 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -374,8 +374,8 @@ jobs: fi test -n "$(command -v mcstas${EXESUFFIX})" mcstas${EXESUFFIX} --version - mctest${SUFFIX} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${GITHUB_RUN_ID} - mctest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} + mctest${SUFFIX} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${GITHUB_RUN_ID} + mctest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} - name: Check for modified instruments id: instr-test diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml index f65029217..7b4826baf 100644 --- a/.github/workflows/mcxtrace-basictest.yml +++ b/.github/workflows/mcxtrace-basictest.yml @@ -381,8 +381,8 @@ jobs: fi test -n "$(command -v mcxtrace${EXESUFFIX})" mcxtrace${EXESUFFIX} --version - mxtest${SUFFIX} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.method }} --uid=${GITHUB_RUN_ID} - mxtest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} + mxtest${SUFFIX} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${GITHUB_RUN_ID} + mxtest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} - name: Check for modified instruments id: instr-test From 165e19bde76236e4425e20d2bf91cbb167f76718 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 17:03:37 +0200 Subject: [PATCH 11/12] Go for 12-char uid identifier created from RUNNER_TRACKING_ID sync to McXtrace --- .github/workflows/mcstas-basictest.yml | 14 ++++++++------ .github/workflows/mcxtrace-basictest.yml | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/mcstas-basictest.yml b/.github/workflows/mcstas-basictest.yml index 2366e62db..84aa68cbb 100644 --- a/.github/workflows/mcstas-basictest.yml +++ b/.github/workflows/mcstas-basictest.yml @@ -110,13 +110,15 @@ jobs: echo MPIINCVAR=%MPIINCVAR% >> %GITHUB_ENV% echo MPILIBVAR=%MPILIBVAR% >> %GITHUB_ENV% - - name: Check versions + - name: Check versions and set worker label id: version-checks run: | which python3 python3 --version which cmake cmake --version + MYWORKERID=`echo ${RUNNER_TRACKING_ID} | md5sum | cut -c1-12` + echo MYWORKERID=${MYWORKERID} >> "$GITHUB_ENV" - name: Get conda dependency list id: conda-deps @@ -346,7 +348,7 @@ jobs: fi test -n "$(command -v mcstas${EXESUFFIX})" mcstas${EXESUFFIX} --version - mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${GITHUB_RUN_ID} + mctest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${MYWORKERID} export SUM=`find run_rngtest -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ ` export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86" if [ "${EXPECTED}" == "${SUM}" ]; @@ -374,8 +376,8 @@ jobs: fi test -n "$(command -v mcstas${EXESUFFIX})" mcstas${EXESUFFIX} --version - mctest${SUFFIX} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${GITHUB_RUN_ID} - mctest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} + mctest${SUFFIX} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${MYWORKERID} + mctest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=BNL_H8,ISIS_CRISP,templateSANS_Mantid,NCrystal_example,ESS_BEER_MCPL,Test_MCPL_input,Test_MCPL_output,Test_KDSource --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${MYWORKERID} - name: Check for modified instruments id: instr-test @@ -432,7 +434,7 @@ jobs: NUMMATCH=`find src/mcstas-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mctest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${MYWORKERID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } compindex=$(( compindex+1 )) else echo No matching tests found @@ -462,7 +464,7 @@ jobs: export SCOPE=" " fi mkdir -p run_mctest && cd run_mctest - ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MCTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${MYWORKERID} || { echo "${MCTEST_EXECUTABLE} failed with exit code $?"; exit 1; } ${MCVIEWTEST_EXECUTABLE} --nobrowse $PWD fi diff --git a/.github/workflows/mcxtrace-basictest.yml b/.github/workflows/mcxtrace-basictest.yml index 7b4826baf..ef451a50c 100644 --- a/.github/workflows/mcxtrace-basictest.yml +++ b/.github/workflows/mcxtrace-basictest.yml @@ -118,13 +118,15 @@ jobs: echo MPIINCVAR=%MPIINCVAR% >> %GITHUB_ENV% echo MPILIBVAR=%MPILIBVAR% >> %GITHUB_ENV% - - name: Check versions + - name: Check versions and set worker label id: version-checks run: | which python3 python3 --version which cmake cmake --version + MYWORKERID=`echo ${RUNNER_TRACKING_ID} | md5sum | cut -c1-12` + echo MYWORKERID=${MYWORKERID} >> "$GITHUB_ENV" - name: Get conda dependency list id: conda-deps @@ -353,7 +355,7 @@ jobs: fi test -n "$(command -v mcxtrace${EXESUFFIX})" mcxtrace${EXESUFFIX} --version - mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${GITHUB_RUN_ID} + mxtest${SUFFIX} --instr=Test_RNG_rand01 --testdir=run_rngtest --suffix=${{ matrix.cogen }}_${{ matrix.method }} --uid=${MYWORKERID} export SUM=`find run_rngtest -name rngout.dat | xargs -n1 grep -v \# | ${MD5SUM} | cut -f1 -d\ ` export EXPECTED="f192ce4609e2225bf9d42ce9c5fa5a86" if [ "${EXPECTED}" == "${SUM}" ]; @@ -381,8 +383,8 @@ jobs: fi test -n "$(command -v mcxtrace${EXESUFFIX})" mcxtrace${EXESUFFIX} --version - mxtest${SUFFIX} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${GITHUB_RUN_ID} - mxtest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${GITHUB_RUN_ID} + mxtest${SUFFIX} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }} --uid=${MYWORKERID} + mxtest${SUFFIX} --mpi=${{ matrix.nmpi }} --instr=JJ_SAXS,ESRF_BM29,Test_MCPL_input,Test_MCPL_output,Test_Absorption --testdir=run_basictests --suffix=${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} --uid=${MYWORKERID} - name: Check for modified instruments id: instr-test @@ -439,7 +441,7 @@ jobs: NUMMATCH=`find src/mcxtrace-comps -name \*.instr -exec grep -H ${comp} \{\} \; | cut -f1 -d: | sort | uniq | wc -l` if [ "$NUMMATCH" -gt "0" ]; then - ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mxtest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir run_mxtest --comp=${comp} --suffix=${{ matrix.cogen }}_CHANGES${compindex}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${MYWORKERID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } compindex=$(( compindex+1 )) else echo No matching tests found @@ -469,7 +471,7 @@ jobs: export SCOPE=" " fi mkdir -p run_mxtest && cd run_mxtest - ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${GITHUB_RUN_ID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } + ${MXTEST_EXECUTABLE} --mpi=${{ matrix.nmpi }} --testdir $PWD $SCOPE --suffix=instrCHANGES_${{ matrix.cogen }}_${{ matrix.method }}_${{ matrix.CC || 'default' }}_${{ matrix.mpi }} $PERMISSIVE --verbose --uid=${MYWORKERID} || { echo "${MXTEST_EXECUTABLE} failed with exit code $?"; exit 1; } ${MXVIEWTEST_EXECUTABLE} --nobrowse $PWD fi From 0e9f3e7bf4a36c8ac47918cd4dfba780df02a562 Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Sat, 29 Aug 2026 17:06:50 +0200 Subject: [PATCH 12/12] Update testsuite workflows --- .github/workflows/mcstas-conda-testsuite.yml | 6 ++++-- .github/workflows/mcxtrace-conda-testsuite.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mcstas-conda-testsuite.yml b/.github/workflows/mcstas-conda-testsuite.yml index 2f740ca2d..b176173f1 100644 --- a/.github/workflows/mcstas-conda-testsuite.yml +++ b/.github/workflows/mcstas-conda-testsuite.yml @@ -48,13 +48,15 @@ jobs: environment-name: mcstas environment-file: dependencies.yml - - name: Check versions + - name: Check versions and set worker label id: version-checks run: | which python3 python3 --version which cmake cmake --version + MYWORKERID=`echo ${RUNNER_TRACKING_ID} | md5sum | cut -c1-12` + echo MYWORKERID=${MYWORKERID} >> "$GITHUB_ENV" - name: Configure build and install mcstas id: mcstas-install @@ -126,7 +128,7 @@ jobs: export TMPDIR=${HOME}/tmp fi # Run the test with 2 core mpi - ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.cogen }}_${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${GITHUB_RUN_ID} + ${MCTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.cogen }}_${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${MYWORKERID} - name: 'Tar output files' id: tar-package if: always() diff --git a/.github/workflows/mcxtrace-conda-testsuite.yml b/.github/workflows/mcxtrace-conda-testsuite.yml index b6a418335..c00702d50 100644 --- a/.github/workflows/mcxtrace-conda-testsuite.yml +++ b/.github/workflows/mcxtrace-conda-testsuite.yml @@ -47,13 +47,15 @@ jobs: environment-file: dependencies.yml environment-name: mcxtrace - - name: Check versions + - name: Check versions and set worker label id: version-checks run: | which python3 python3 --version which cmake cmake --version + MYWORKERID=`echo ${RUNNER_TRACKING_ID} | md5sum | cut -c1-12` + echo MYWORKERID=${MYWORKERID} >> "$GITHUB_ENV" - name: Configure build and install mcxtrace id: mcxtrace-install @@ -107,7 +109,7 @@ jobs: export TMPDIR=${HOME}/tmp fi # Run the test with 2 core mpi - ${MXTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${GITHUB_RUN_ID} + ${MXTEST_EXECUTABLE} --verbose --testdir $PWD --suffix ${{ matrix.os }}_${{ matrix.mpi }} --mpi=${{ matrix.nmpi }} --uid=${MYWORKERID} - name: 'Tar output files' id: tar-package