Skip to content

Commit c165db8

Browse files
authored
Merge branch 'acts-project:main' into main
2 parents baac6bf + e9a1664 commit c165db8

1,387 files changed

Lines changed: 36555 additions & 13879 deletions

File tree

Some content is hidden

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

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/acts-project/spack-container:18.0.0_linux-ubuntu24.04_gcc-13.3.0
1+
FROM ghcr.io/acts-project/spack-container:19.0.0_linux-ubuntu24.04_gcc-13.3.0
22

33
RUN apt-get update && apt-get install -y clangd vim
44

.github/actions/dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ inputs:
2121
DEPENDENCY_TAG:
2222
description: 'Dependency tag to pull from'
2323
required: false
24-
default: 'v18.0.0'
24+
default: 'v19.0.0'
2525
full_install:
2626
description: 'Whether to do a full dependency installation including Geant4 datasets and Python packages'
2727
required: false

.github/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
- changed-files:
3434
- any-glob-to-any-file:
3535
- CI/physmon/reference/**
36-
- Examples/Python/tests/root_file_hashes.txt
36+
- Python/Examples/tests/root_file_hashes.txt
3737
'Event Data Model':
3838
- changed-files:
3939
- any-glob-to-any-file:

.github/workflows/analysis.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ env:
2222
CCACHE_MAXSIZE: 1.25G
2323
CCACHE_KEY_SUFFIX: r2
2424
ACTS_LOG_FAILURE_THRESHOLD: WARNING
25-
DEPENDENCY_TAG: v17.0.0
2625

2726
# NOTE this only builds core unittests to reduce the output size. if we
2827
# found a way to have Github actions not fail regularly with this job
@@ -42,7 +41,7 @@ jobs:
4241
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4342

4443
- name: Cache build
45-
uses: actions/cache@v4
44+
uses: actions/cache@v5
4645
with:
4746
path: ${{ env.CCACHE_DIR }}
4847
key: ccache-${{ runner.os }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
@@ -71,7 +70,7 @@ jobs:
7170
&& cd build
7271
&& /usr/bin/python3 ../CI/test_coverage.py
7372
74-
- uses: actions/upload-artifact@v5
73+
- uses: actions/upload-artifact@v6
7574
with:
7675
name: coverage-build
7776
path: build
@@ -82,7 +81,7 @@ jobs:
8281

8382
- name: Persist PR number
8483
if: github.event_name == 'pull_request'
85-
uses: actions/upload-artifact@v5
84+
uses: actions/upload-artifact@v6
8685
with:
8786
name: PR_NUMBER
8887
path: PR_NUMBER.txt
@@ -114,7 +113,7 @@ jobs:
114113
run: cmakeperf collect build/compile_commands.json -o perf.csv
115114
- name: Results
116115
run: cmakeperf print perf.csv
117-
- uses: actions/upload-artifact@v5
116+
- uses: actions/upload-artifact@v6
118117
with:
119118
name: cmakeperf
120119
path: perf.csv

.github/workflows/builds.yml

Lines changed: 74 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- name: Restore ccache
4444
id: ccache-restore
45-
uses: actions/cache/restore@v4
45+
uses: actions/cache/restore@v5
4646
with:
4747
path: ${{ env.CCACHE_DIR }}
4848
key: ccache-${{ runner.os }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
@@ -60,11 +60,15 @@ jobs:
6060
- name: Build
6161
run: cmake --build build
6262

63+
- name: Build docs examples
64+
# these are excluded from the ALL target, but we want to test them here
65+
run: cmake --build build --target docs-examples
66+
6367
- name: ccache stats
6468
run: ccache -s
6569

6670
- name: Save ccache
67-
uses: actions/cache/save@v4
71+
uses: actions/cache/save@v5
6872
if: always()
6973
with:
7074
path: ${{ github.workspace }}/ccache
@@ -82,7 +86,7 @@ jobs:
8286
- name: Package build
8387
run: tar czf build.tar.gz -C build --exclude "*.o" --exclude "bin/ActsUnitTest*" --exclude "bin/ActsIntegrationTest*" .
8488

85-
- uses: actions/upload-artifact@v5
89+
- uses: actions/upload-artifact@v6
8690
with:
8791
name: acts-linux-ubuntu
8892
path: build.tar.gz
@@ -119,7 +123,7 @@ jobs:
119123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120124
full_install: true
121125

122-
- uses: actions/download-artifact@v6
126+
- uses: actions/download-artifact@v7
123127
with:
124128
name: acts-linux-ubuntu
125129

@@ -157,7 +161,7 @@ jobs:
157161
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
158162
full_install: true
159163

160-
- uses: actions/download-artifact@v6
164+
- uses: actions/download-artifact@v7
161165
with:
162166
name: acts-linux-ubuntu
163167

@@ -177,7 +181,7 @@ jobs:
177181
mkdir -p physmon
178182
cat physmon/summary.md >> $GITHUB_STEP_SUMMARY
179183
180-
- uses: actions/upload-artifact@v5
184+
- uses: actions/upload-artifact@v6
181185
if: always()
182186
with:
183187
name: physmon
@@ -191,7 +195,7 @@ jobs:
191195
- name: Install dependencies
192196
run: pip3 install spyral-cli==1.1.2
193197

194-
- uses: actions/download-artifact@v6
198+
- uses: actions/download-artifact@v7
195199
with:
196200
name: physmon
197201
path: physmon
@@ -236,7 +240,7 @@ jobs:
236240
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
237241

238242
- name: Restore ccache
239-
uses: actions/cache/restore@v4
243+
uses: actions/cache/restore@v5
240244
id: ccache-restore
241245
with:
242246
path: ${{ env.CCACHE_DIR }}
@@ -260,7 +264,7 @@ jobs:
260264
run: ccache -s
261265

262266
- name: Save ccache
263-
uses: actions/cache/save@v4
267+
uses: actions/cache/save@v5
264268
if: always()
265269
with:
266270
path: ${{ github.workspace }}/ccache
@@ -314,7 +318,7 @@ jobs:
314318
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
315319

316320
- name: Restore ccache
317-
uses: actions/cache/restore@v4
321+
uses: actions/cache/restore@v5
318322
id: ccache-restore
319323
with:
320324
path: ${{ env.CCACHE_DIR }}
@@ -329,14 +333,17 @@ jobs:
329333
--preset=github-ci
330334
-DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
331335
336+
- run: ls -al /Users/runner/work/acts/acts/dependencies/view/lib
337+
- run: find /Users/runner/work/acts/acts/dependencies/view/lib -type l -name "libRIO.*"
338+
332339
- name: Build
333340
run: cmake --build build
334341

335342
- name: ccache stats
336343
run: ccache -s
337344

338345
- name: Save ccache
339-
uses: actions/cache/save@v4
346+
uses: actions/cache/save@v5
340347
if: always()
341348
with:
342349
path: ${{ github.workspace }}/ccache
@@ -351,7 +358,7 @@ jobs:
351358
- name: Install
352359
run: cmake --build build --target install
353360

354-
- uses: actions/upload-artifact@v5
361+
- uses: actions/upload-artifact@v6
355362
with:
356363
name: acts-macos
357364
path: ${{ env.INSTALL_DIR }}
@@ -389,7 +396,7 @@ jobs:
389396

390397
- name: Restore ccache
391398
id: ccache-restore
392-
uses: actions/cache/restore@v4
399+
uses: actions/cache/restore@v5
393400
with:
394401
path: ${{ env.CCACHE_DIR }}
395402
key: ccache-${{ runner.os }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
@@ -458,14 +465,14 @@ jobs:
458465
459466
- name: Upload Artifact
460467
if: ${{ steps.build.outcome == 'failure' && github.event_name == 'pull_request' }}
461-
uses: actions/upload-artifact@v5
468+
uses: actions/upload-artifact@v6
462469
with:
463470
name: comment-50-external-failure.md
464471
path: comment-50-external-failure.md
465472
retention-days: 5
466473

467474
- name: Save ccache
468-
uses: actions/cache/save@v4
475+
uses: actions/cache/save@v5
469476
if: always()
470477
with:
471478
path: ${{ github.workspace }}/ccache
@@ -542,8 +549,59 @@ jobs:
542549
543550
- name: Upload Artifact
544551
if: ${{ steps.build.outcome == 'failure' && github.event_name == 'pull_request' }}
545-
uses: actions/upload-artifact@v5
552+
uses: actions/upload-artifact@v6
546553
with:
547554
name: comment-51-key4hep-external-failure.md
548555
path: comment-51-key4hep-external-failure.md
549556
retention-days: 5
557+
558+
559+
linux_ubuntu_python_wheel:
560+
runs-on: ubuntu-latest
561+
needs: [linux_ubuntu]
562+
container: ghcr.io/acts-project/ubuntu2404:83
563+
564+
steps:
565+
- uses: actions/checkout@v6
566+
567+
- name: Install dependencies
568+
uses: ./.github/actions/dependencies
569+
with:
570+
compiler: g++
571+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
572+
573+
- name: Restore ccache
574+
id: ccache-restore
575+
uses: actions/cache/restore@v5
576+
with:
577+
path: ${{ env.CCACHE_DIR }}
578+
key: ccache-${{ runner.os }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
579+
restore-keys: |
580+
ccache-${{ runner.os }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-
581+
582+
- name: Reset ccache
583+
run: ccache -z
584+
585+
- name: Build wheel with pip
586+
run: pip wheel . -v
587+
588+
- name: ccache stats
589+
run: ccache -s
590+
591+
- name: Install wheel
592+
run: pip install $(ls *.whl)
593+
594+
- name: Save ccache
595+
uses: actions/cache/save@v5
596+
if: always()
597+
with:
598+
path: ${{ github.workspace }}/ccache
599+
key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
600+
601+
- uses: actions/upload-artifact@v6
602+
with:
603+
name: linux-ubuntu-wheel
604+
path: "*.whl"
605+
606+
- name: Test
607+
run: python3 -c "import acts; import acts.examples; v = acts.Vector3(1,2,3)"

.github/workflows/checks.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
jobs:
1616
lint:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-slim
1818
env:
1919
PRE_COMMIT_HOME: '/tmp/pre-commit'
2020

@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
python-version: '3.12'
2828

29-
- uses: actions/cache@v4
29+
- uses: actions/cache@v5
3030
with:
3131
path: |
3232
${{ env.PRE_COMMIT_HOME }}
@@ -39,7 +39,7 @@ jobs:
3939
run: pre-commit run --all-files --show-diff-on-failure
4040

4141
smearing_config:
42-
runs-on: ubuntu-latest
42+
runs-on: ubuntu-slim
4343
steps:
4444
- uses: actions/checkout@v6
4545
- uses: actions/setup-python@v6
@@ -54,14 +54,15 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v6
5656
- name: Install clang
57-
run: >
57+
run: |
58+
sudo apt-get update
5859
sudo apt-get install -y clang libeigen3-dev libboost-dev parallel
5960
- name: Check
6061
run: >
6162
CI/missing_include_check.sh
6263
6364
fpe_masks:
64-
runs-on: ubuntu-latest
65+
runs-on: ubuntu-slim
6566
steps:
6667
- uses: actions/checkout@v6
6768
- uses: actions/setup-python@v6
@@ -75,7 +76,7 @@ jobs:
7576
CI/check_fpe_masks.py --token ${{ secrets.GITHUB_TOKEN }}
7677
7778
unused_files:
78-
runs-on: ubuntu-latest
79+
runs-on: ubuntu-slim
7980
steps:
8081
- uses: actions/checkout@v6
8182
- uses: actions/setup-python@v6

0 commit comments

Comments
 (0)