Merge branch 'main' of https://github.com/eic/epic.git

Author: lkosarz

.devcontainer/devcontainer.json

@@ -1,4 +1,4 @@
 {
   "name": "eic-shell",
-  "image": "ghcr.io/eic/eic_xl:nightly"
+  "image": "ghcr.io/eic/eic_ci:nightly"
 }

.github/dependabot.yml

@@ -9,3 +9,5 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+    reviewers:
+      - "eic/epic-detector-geometry-review"

.github/workflows/check-geometry-configs.yml

@@ -11,8 +11,8 @@ jobs:
   check-geometry-configs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-fast-eic-shell
         path: install/

.github/workflows/check-tracking-geometry.yml

@@ -14,8 +14,8 @@ jobs:
       matrix:
         detector_config: ${{fromJson(inputs.detector_configs)}}
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-fast-eic-shell
         path: install/
@@ -26,6 +26,7 @@ jobs:
         network_types: "none"
         setup: install/bin/thisepic.sh
         run: |
+          /usr/bin/time -v \
           root -b -q "scripts/test_ACTS.cxx+(\"${DETECTOR_PATH}/${{matrix.detector_config}}.xml\")" | tee check_tracking_geometry.out
           bin/acts_geo_check check_tracking_geometry.out
     - uses: actions/upload-artifact@v4

.github/workflows/convert-to-gdml.yml

@@ -11,8 +11,8 @@ jobs:
   convert-to-gdml:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/

.github/workflows/convert-to-step.yml

@@ -14,8 +14,8 @@ jobs:
       matrix:
         detector_config: ${{fromJson(inputs.detector_configs)}}
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-fast-eic-shell
         path: install/

.github/workflows/convert-to-tgeo.yml

@@ -11,8 +11,8 @@ jobs:
   convert-to-tgeo:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/

.github/workflows/labeler.yml

@@ -9,6 +9,6 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/labeler@v5
+    - uses: actions/labeler@v6
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/linux-eic-shell.yml

@@ -18,7 +18,7 @@ jobs:
   xmllint-before-build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - run: |
         sudo apt-get update
         sudo apt-get install -y libxml2-utils
@@ -30,7 +30,7 @@ jobs:
       configs_csv: ${{ steps.list-detector-configs.outputs.configs_csv }}
       configs_json: ${{ steps.list-detector-configs.outputs.configs_json }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - id: list-detector-configs
       run: |
         CONFIGS_CSV=$(
@@ -60,7 +60,7 @@ jobs:
     env:
       PREFIX: ${{ github.workspace }}/install
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Prepare ccache timestamp
       id: ccache_cache_timestamp
       run: |
@@ -116,7 +116,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: build
     steps:
-    - uses: actions/download-artifact@v4
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -145,8 +145,8 @@ jobs:
       - build
       - check-tracking-geometry
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -165,7 +165,8 @@ jobs:
         name: material_map
         path: |
           scripts/material_map/*.json
-          scripts/material_map/*.root
+          scripts/material_map/material-map.cbor
+          scripts/material_map/plots/
           scripts/material_map/Surfaces/
           scripts/material_map/Validation/
         if-no-files-found: error
@@ -201,8 +202,8 @@ jobs:
       matrix:
         detector_config: [epic_craterlake]
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -228,8 +229,8 @@ jobs:
       matrix:
         detector_config: [epic_craterlake]
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -296,8 +297,8 @@ jobs:
         detector_config: [epic_craterlake] # FIXME
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -318,8 +319,8 @@ jobs:
     needs: build
     if: github.ref == 'refs/heads/main'
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -349,8 +350,8 @@ jobs:
         detector_config: [epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -374,8 +375,8 @@ jobs:
         detector_config: [epic_inner_detector, epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-fast-eic-shell
         path: install/
@@ -395,6 +396,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.actor != 'dependabot[bot]' && github.ref != 'refs/heads/main'
     needs: [check-overlap-tgeo, check-overlap-geant4-fast]
+    outputs:
+      json: ${{ steps.trigger.outputs.json }}
     steps:
     - uses: eic/trigger-gitlab-ci@v3
       id: trigger
@@ -433,8 +436,8 @@ jobs:
         detector_config: [epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-fast-eic-shell
         path: install/
@@ -462,8 +465,8 @@ jobs:
         detector_config: [epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: ${{ matrix.detector_config }}.prim
         path: prim/
@@ -492,8 +495,8 @@ jobs:
         detector_config: [epic_craterlake]
       fail-fast: false
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: ${{ matrix.detector_config }}.prim
         path: prim/
@@ -536,8 +539,8 @@ jobs:
         particle: [pi, e]
         detector_config: [epic_craterlake]
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -569,7 +572,6 @@ jobs:
         platform-release: "eic_xl:nightly"
         setup: install/bin/thisepic.sh
         run: |
-          export PYTHONPATH=$HOME/.local/lib/python3.10/site-packages:$PYTHONPATH
           mkdir capybara-reports
           shopt -s nullglob
           capybara bara ref/sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root* sim_${{ matrix.particle }}_1GeV_20GeV_${{ matrix.detector_config }}.edm4hep.root
@@ -595,8 +597,8 @@ jobs:
         - beam: 5x41
           minq2: 1000
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         name: build-gcc-full-eic-shell
         path: install/
@@ -638,8 +640,6 @@ jobs:
         platform-release: "eic_xl:nightly"
         setup: install/bin/thisepic.sh
         run: |
-          pip install 'pygithub>=2' 'bokeh>=3'
-          export PYTHONPATH=$HOME/.local/lib/python3.10/site-packages:$PYTHONPATH
           mkdir capybara-reports
           shopt -s nullglob
           capybara bara ref/sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.edm4hep.root* sim_dis_${{matrix.beam}}_minQ2=${{matrix.minq2}}_${{ matrix.detector_config }}.edm4hep.root
@@ -675,12 +675,12 @@ jobs:
     - merge-parameter-table
     - merge-dawn-view
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/download-artifact@v4
+    - uses: actions/checkout@v5
+    - uses: actions/download-artifact@v5
       with:
         path: artifacts/
     - uses: actions/jekyll-build-pages@v1
-    - uses: actions/upload-pages-artifact@v3
+    - uses: actions/upload-pages-artifact@v4
       with:
         retention-days: 7
 
@@ -699,3 +699,16 @@ jobs:
     - name: Deploy to GitHub Pages
       id: deployment
       uses: actions/deploy-pages@v4
+
+  cancel-container:
+    if: cancelled() || failure()
+    needs:
+    - trigger-container
+    - deploy-artifacts-page
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel container
+        run: |
+          curl --request POST \
+             --header "PRIVATE-TOKEN: ${{ secrets.EICWEB_CONTAINER_CANCEL }}" \
+             https://eicweb.phy.anl.gov/api/v4/projects/290/pipelines/$(echo '${{ needs.trigger-container.outputs.json }}' | jq --raw-output .id)/cancel

.github/workflows/pr-backport.yml

@@ -12,7 +12,7 @@ jobs:
     # Don't run on closed unmerged pull requests
     if: github.event.pull_request.merged
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Create backport pull requests
         uses: korthout/backport-action@v3
         with: