Skip to content

Commit e8fc04d

Browse files
benjaminhuthclaude
andcommitted
Merge upstream/main into feature/collider-ml-reader-arrow
Integrates the official Arrow/Parquet base (PR acts-project#5410) from upstream/main. Our branch retains only the ColliderML reader on top: - ArrowUtil: keep flatColumnUInt*/readFlatParquetFile (used by ColliderML) - Parquet CMakeLists: keep ColliderMLInputConverter target block - Python Arrow bindings: keep ColliderMLInputConverter pybind11 declarations - root_file_hashes.txt: keep ColliderML test hashes + upstream strip_space_points rename Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2 parents 355ec56 + 2aa0947 commit e8fc04d

63 files changed

Lines changed: 2275 additions & 1137 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.

.github/actions/dependencies/action.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ runs:
3939
using: 'composite'
4040
steps:
4141
- name: Setup Python version
42-
uses: actions/setup-python@v6
42+
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
4343
with:
4444
python-version: "3.12"
4545

4646
- name: Install the latest version of uv
47-
uses: astral-sh/setup-uv@v7
47+
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
4848

4949
- name: Prerequisites
5050
if: startsWith(runner.os, 'macos')
@@ -54,7 +54,7 @@ runs:
5454
5555
- name: Restore cache
5656
id: cache-restore
57-
uses: actions/cache/restore@v5
57+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
5858
with:
5959
path: spack_cache
6060
key: spack-r4-${{ inputs.spack_version }}-${{ inputs.spack_repo_version }}-${{ hashFiles('CI/dependencies/setup_spack.sh') }}
@@ -81,7 +81,7 @@ runs:
8181
8282
- name: Save cache
8383
if: steps.cache-restore.outputs.cache-hit != 'true'
84-
uses: actions/cache/save@v4
84+
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
8585
with:
8686
path: |
8787
spack_cache
@@ -94,15 +94,18 @@ runs:
9494
SPACK_REPO_VERSION: ${{ inputs.spack_repo_version }}
9595
DEPENDENCY_TAG: ${{ inputs.DEPENDENCY_TAG }}
9696
CXXSTD: ${{ inputs.cxx_std }}
97+
ENV_FILE: ${{ inputs.env_file }}
98+
FULL_INSTALL: ${{ inputs.full_install }}
99+
COMPILER: ${{ inputs.compiler }}
97100
run: |
98-
args="-e ${{ inputs.env_file }}"
99-
if [ "${{ inputs.full_install }}" == "true" ]; then
101+
args="-e $ENV_FILE"
102+
if [ "$FULL_INSTALL" == "true" ]; then
100103
echo "Full install"
101104
args="${args} -f"
102105
fi
103-
if [ -n "${{ inputs.compiler }}" ]; then
106+
if [ -n "$COMPILER" ]; then
104107
echo "With compiler"
105-
args="${args} -c ${{ inputs.compiler }}"
108+
args="${args} -c $COMPILER"
106109
fi
107110
108111
CI/dependencies/setup.sh $args

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ updates:
77
day: "sunday"
88
time: "01:23"
99
timezone: "Europe/Zurich"
10+
cooldown:
11+
default-days: 7
1012

1113
- package-ecosystem: "pre-commit"
1214
directory: "/"
@@ -15,3 +17,5 @@ updates:
1517
day: "sunday"
1618
time: "01:23"
1719
timezone: "Europe/Zurich"
20+
cooldown:
21+
default-days: 7

.github/workflows/analysis.yml

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,18 @@ env:
2626
# NOTE this only builds core unittests to reduce the output size. if we
2727
# found a way to have Github actions not fail regularly with this job
2828
# all unit tests should be reactivated.
29+
permissions:
30+
contents: read
31+
2932
jobs:
3033
build_debug:
3134
runs-on: ubuntu-latest
3235
container: ghcr.io/acts-project/ubuntu2404:85
3336
steps:
3437

35-
- uses: actions/checkout@v6
38+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
with:
40+
persist-credentials: false
3641

3742
- name: Install dependencies
3843
uses: ./.github/actions/dependencies
@@ -43,26 +48,31 @@ jobs:
4348

4449
- name: Save PR metadata
4550
if: github.event_name == 'pull_request'
51+
env:
52+
PR_NUMBER: ${{ github.event.number }}
53+
PR_SHA: ${{ github.event.pull_request.head.sha }}
54+
BASE_SHA: ${{ github.event.pull_request.base.sha }}
55+
MERGE_SHA: ${{ github.sha }}
4656
run: |
4757
# Shallow clone: parent commits aren't available via git,
4858
# but GitHub provides the SHAs through the event context.
4959
printf '{"pr_number":"%s","pr_sha":"%s","base_sha":"%s","merge_sha":"%s"}\n' \
50-
"${{ github.event.number }}" \
51-
"${{ github.event.pull_request.head.sha }}" \
52-
"${{ github.event.pull_request.base.sha }}" \
53-
"${{ github.sha }}" \
60+
"$PR_NUMBER" \
61+
"$PR_SHA" \
62+
"$BASE_SHA" \
63+
"$MERGE_SHA" \
5464
> PR_metadata.json
5565
cat PR_metadata.json
5666
5767
- name: Persist PR metadata
5868
if: github.event_name == 'pull_request'
59-
uses: actions/upload-artifact@v7
69+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6070
with:
6171
name: PR_metadata
6272
path: PR_metadata.json
6373

6474
- name: Cache build
65-
uses: actions/cache@v5
75+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
6676
with:
6777
path: ${{ env.CCACHE_DIR }}
6878
key: ccache-${{ runner.os }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
@@ -90,26 +100,29 @@ jobs:
90100
&& du -sh build
91101
- name: Coverage
92102
run: |
93-
uv run --no-project CI/test_coverage.py build --filter
103+
uv run --no-project --no-build CI/test_coverage.py build --filter
94104
95-
- uses: actions/upload-artifact@v7
105+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
96106
if: always()
97107
with:
98108
name: coverage-build
99109
path: |
100110
build/compile_commands.json
101111
build/coverage/cov.xml
102112
103-
- uses: actions/upload-artifact@v7
113+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
104114
if: always()
105115
id: artifact-upload-step
106116
with:
107117
name: coverage-html
108118
path: build/coverage/html
109119

110120
- name: Coverage display
121+
env:
122+
REPOSITORY: ${{ github.repository }}
123+
ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }}
111124
run: |
112-
base_link='https://acts-herald.app.cern.ch/view/${{ github.repository }}/${{ steps.artifact-upload-step.outputs.artifact-id }}'
125+
base_link="https://acts-herald.app.cern.ch/view/${REPOSITORY}/${ARTIFACT_ID}"
113126
link="$base_link/index.html"
114127
echo "🛡️ Code coverage available at: $link"
115128
echo "**🛡️ Code coverage available [here]($link)**" >> $GITHUB_STEP_SUMMARY
@@ -119,18 +132,21 @@ jobs:
119132
container: ghcr.io/acts-project/ubuntu2404_clang22:85
120133

121134
steps:
122-
- uses: actions/checkout@v6
135+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
123136
with:
124137
fetch-depth: 0
138+
persist-credentials: false
125139

126140
- name: Mark workspace as safe
127141
run: git config --global --add safe.directory /__w/acts/acts
128142

129143
- name: Fetch base branch
130144
if: github.event_name == 'pull_request'
131-
run: git fetch origin "${{ github.base_ref }}"
145+
env:
146+
BASE_REF: ${{ github.base_ref }}
147+
run: git fetch origin "$BASE_REF"
132148

133-
- uses: astral-sh/setup-uv@v7
149+
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
134150

135151
- name: Install clang-tidy
136152
run: |
@@ -158,24 +174,26 @@ jobs:
158174

159175
- name: Analyze (PR - changed files only)
160176
if: github.event_name == 'pull_request'
177+
env:
178+
BASE_REF: ${{ github.base_ref }}
161179
run: >
162-
uv run CI/clang_tidy/run_clang_tidy_pr.py
163-
analyze build fixes.yml --base-ref "origin/${{ github.base_ref }}"
180+
uv run --no-build CI/clang_tidy/run_clang_tidy_pr.py
181+
analyze build fixes.yml --base-ref "origin/$BASE_REF"
164182
165183
- name: Analyze (push - all files)
166184
if: github.event_name == 'push'
167185
run: >
168-
uv run CI/clang_tidy/run_clang_tidy_pr.py
186+
uv run --no-build CI/clang_tidy/run_clang_tidy_pr.py
169187
analyze build fixes.yml --all
170188
171189
- name: Upload fixes
172190
if: always()
173-
uses: actions/upload-artifact@v7
191+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
174192
with:
175193
name: clang-tidy-fixes
176194
path: fixes.yml
177195

178196
- name: Annotate
179197
run: >
180-
uv run CI/clang_tidy/run_clang_tidy_pr.py
198+
uv run --no-build CI/clang_tidy/run_clang_tidy_pr.py
181199
annotate fixes.yml

.github/workflows/backport.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)