Skip to content

Commit 5c29863

Browse files
committed
Merge branch 'main' into nHCal-dev-update
2 parents 15aff74 + 59b9c8d commit 5c29863

File tree

58 files changed

+3694
-605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3694
-605
lines changed

.github/release.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
changelog:
2+
exclude:
3+
authors:
4+
- 'dependabot'
5+
- 'pre-commit-ci'
6+
categories:
7+
- title: 🕸️ Tracking
8+
labels:
9+
- 'topic: tracking'
10+
- title: 🪪 Particle identification
11+
labels:
12+
- 'topic: PID'
13+
- title: 🚿 Calorimetry
14+
labels:
15+
- 'topic: calorimetry'
16+
- title: ◀️ Backward
17+
labels:
18+
- 'topic: backward'
19+
- title: ▶️ Forward
20+
labels:
21+
- 'topic: forward'
22+
- title: ⏪ Far Backward
23+
labels:
24+
- 'topic: far-backward'
25+
- title: ⏩ Far Forward
26+
labels:
27+
- 'topic: far-forward'
28+
- title: ⚙️ Infrastructure
29+
labels:
30+
- 'topic: infrastructure'
31+
- title: 🐛 Bugs fixed
32+
labels:
33+
- 'bug'
34+
- title: 🔩 Other Changes
35+
labels:
36+
- '*'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/download-artifact@v5
15+
- uses: actions/download-artifact@v6
1616
with:
17-
name: build-gcc-fast-eic-shell
17+
name: build-gcc-nightly-fast-eic-shell
1818
path: install/
1919
- uses: cvmfs-contrib/github-action-cvmfs@v5
2020
- uses: eic/run-cvmfs-osg-eic-shell@main

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
detector_config: ${{fromJson(inputs.detector_configs)}}
1616
steps:
1717
- uses: actions/checkout@v5
18-
- uses: actions/download-artifact@v5
18+
- uses: actions/download-artifact@v6
1919
with:
20-
name: build-gcc-fast-eic-shell
20+
name: build-gcc-nightly-fast-eic-shell
2121
path: install/
2222
- uses: cvmfs-contrib/github-action-cvmfs@v5
2323
- uses: eic/run-cvmfs-osg-eic-shell@main
@@ -29,13 +29,13 @@ jobs:
2929
/usr/bin/time -v \
3030
root -b -q "scripts/test_ACTS.cxx+(\"${DETECTOR_PATH}/${{matrix.detector_config}}.xml\")" | tee check_tracking_geometry.out
3131
bin/acts_geo_check check_tracking_geometry.out
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@v5
3333
with:
3434
name: ${{matrix.detector_config}}.obj
3535
path: |
3636
*.obj
3737
*.mpl
38-
- uses: actions/upload-artifact@v4
38+
- uses: actions/upload-artifact@v5
3939
with:
4040
name: ${{matrix.detector_config}}.ply
4141
path: |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/download-artifact@v5
15+
- uses: actions/download-artifact@v6
1616
with:
17-
name: build-gcc-full-eic-shell
17+
name: build-gcc-nightly-full-eic-shell
1818
path: install/
1919
- uses: cvmfs-contrib/github-action-cvmfs@v5
2020
- uses: eic/run-cvmfs-osg-eic-shell@main
@@ -29,7 +29,7 @@ jobs:
2929
geoConverter -compact2gdml -input ${DETECTOR_PATH}/${config}.xml -output ${config}.gdml ;
3030
echo "::endgroup::" ;
3131
done
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@v5
3333
with:
3434
name: gdml
3535
path: "*.gdml"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
detector_config: ${{fromJson(inputs.detector_configs)}}
1616
steps:
1717
- uses: actions/checkout@v5
18-
- uses: actions/download-artifact@v5
18+
- uses: actions/download-artifact@v6
1919
with:
20-
name: build-gcc-fast-eic-shell
20+
name: build-gcc-nightly-fast-eic-shell
2121
path: install/
2222
- uses: cvmfs-contrib/github-action-cvmfs@v5
2323
- uses: eic/run-cvmfs-osg-eic-shell@main
@@ -38,7 +38,7 @@ jobs:
3838
detectors[OuterBarrelMPGDSubAssembly]='-l 4'
3939
# Export to one STEP file
4040
npdet_to_step $(for d in ${!detectors[@]} ; do echo part ${detectors[$d]} $d ; done) -o ${{matrix.detector_config}} $DETECTOR_PATH/${{matrix.detector_config}}.xml 2>&1 | sed '/TGeoMatrix::dtor/d'
41-
- uses: actions/upload-artifact@v4
41+
- uses: actions/upload-artifact@v5
4242
with:
4343
name: ${{matrix.detector_config}}.stp
4444
path: ${{matrix.detector_config}}.stp

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/download-artifact@v5
15+
- uses: actions/download-artifact@v6
1616
with:
17-
name: build-gcc-full-eic-shell
17+
name: build-gcc-nightly-full-eic-shell
1818
path: install/
1919
- uses: cvmfs-contrib/github-action-cvmfs@v5
2020
- uses: eic/run-cvmfs-osg-eic-shell@main
@@ -29,7 +29,7 @@ jobs:
2929
geoConverter -compact2tgeo -input ${DETECTOR_PATH}/${config}.xml -output ${config}.root
3030
echo "::endgroup::" ;
3131
done
32-
- uses: actions/upload-artifact@v4
32+
- uses: actions/upload-artifact@v5
3333
with:
3434
name: tgeo
3535
path: "*.root"

0 commit comments

Comments
 (0)