Merge branch 'main' into Load-Low-Q2-TMVA-file

eic · May 25, 2024 · 0f973fe · 0f973fe
2 parents 714d9ce + f638ae9
commit 0f973fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/linux-eic-shell.yml b/.github/workflows/linux-eic-shell.yml
@@ -517,19 +517,30 @@ jobs:
           noverlaps="$(grep -c GeomVol1002 doc/overlap_check_geant4.out || true)"
           if [[ "${noverlaps}" -gt "0" ]] ; then echo "${noverlaps} overlaps found!" && false ; fi
 
-  trigger-detector-benchmarks:
+  trigger-benchmarks:
     runs-on: ubuntu-latest
     needs: [check-overlap-tgeo, check-overlap-geant4-fast]
     strategy:
       matrix:
         detector_config: [epic_craterlake]
+        benchmark_repo: [detector_benchmarks, physics_benchmarks, reconstruction_benchmarks]
+        include:
+        - benchmark_repo: detector_benchmarks
+          project_id: 399
+          secret_var: EICWEB_DETECTOR_BENCHMARK_TRIGGER
+        - benchmark_repo: physics_benchmarks
+          project_id: 400
+          secret_var: EICWEB_PHYSICS_BENCHMARK_TRIGGER
+        - benchmark_repo: reconstruction_benchmarks
+          project_id: 408
+          secret_var: EICWEB_RECONSTRUCTION_BENCHMARK_TRIGGER
     steps:
     - uses: eic/trigger-gitlab-ci@v3
       id: trigger
       with:
         url: https://eicweb.phy.anl.gov
-        project_id: 399
-        token: ${{ secrets.EICWEB_DETECTOR_BENCHMARK_TRIGGER }}
+        project_id: ${{ matrix.project_id }}
+        token: ${{ secrets[matrix.secret_var] }}
         ref_name: master
         variables: |
           DETECTOR=epic
@@ -547,7 +558,7 @@ jobs:
           -f state="pending" \
           -f target_url="${{ steps.trigger.outputs.web_url }}" \
           -f description="Triggered... $(TZ=America/New_York date)" \
-          -f context="eicweb/detector_benchmarks (${{ matrix.detector_config }})"
+          -f context="eicweb/${{ matrix.benchmark_repo }} (${{ matrix.detector_config }})"
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/templates/thisepic.sh.in b/templates/thisepic.sh.in
@@ -7,7 +7,7 @@ export DETECTOR_CONFIG=${1:-@PROJECT_NAME@}
 ## Warn is not the right name (this script is sourced, hence $1)
 if [[ "$(basename ${BASH_SOURCE[0]})" != "thisepic.sh" ]]; then
         echo "Warning: This script will cease to exist at '$(realpath --no-symlinks ${BASH_SOURCE[0]})'."
-        echo "         Please use the version at '$(realpath --no-symlinks $(dirname ${BASH_SOURCE[0]})/thisepic.sh)'."
+        echo "         Please use the version at '$(realpath --no-symlinks $(dirname ${BASH_SOURCE[0]})/bin/thisepic.sh)'."
 fi
 
 ## Export detector libraries