Skip to content

Commit 63e826c

Browse files
authored
Merge branch 'main' into patch-2025-09-19-15-24
2 parents 2ebb9af + b5af4d3 commit 63e826c

395 files changed

Lines changed: 32621 additions & 5311 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.

.clangd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Diagnostics:
1717
UnusedIncludes: Strict
1818
# >= clangd-17
1919
MissingIncludes: None
20+
# >=clangd-12 - Enable clang-tidy and read configuration from .clang-tidy
21+
ClangTidy: {}
2022

2123
Hover:
2224
# >= clangd-14

.github/dockerfiles/intel_oneapi/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get update && \
66

77
WORKDIR /opt/Shamrock_src
88

9-
COPY . .
9+
ADD repo.tar.gz .
1010

1111
RUN ls -la
1212

.github/dockerfiles/phys_test_image_acpp_omp/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ ARG CLANGVERSION=18
44

55
RUN wget https://apt.llvm.org/llvm.sh && \
66
chmod +x llvm.sh && \
7+
sudo apt update && \
78
sudo ./llvm.sh ${CLANGVERSION} && \
89
sudo apt install -y libclang-${CLANGVERSION}-dev clang-tools-${CLANGVERSION} libomp-${CLANGVERSION}-dev && \
910
rm llvm.sh
1011

12+
RUN sudo apt install -y gfortran
1113
RUN pip install matplotlib numpy scipy h5py
1214

1315
WORKDIR /opt/Shamrock_src
1416

15-
COPY . .
17+
ADD repo.tar.gz .
1618

1719
RUN ls -la
1820

.github/workflows/autofix-pr.yml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: autofix-pr
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
permissions:
13+
contents: write
14+
pull-requests: write
15+
16+
jobs:
17+
autofix-pr:
18+
name: "Auto-fix and create PR if needed"
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v6
22+
with:
23+
fetch-depth: 0
24+
token: ${{ secrets.GHACTION_PAT }}
25+
26+
- uses: actions/setup-python@v5
27+
with:
28+
python-version: '>=3.10'
29+
30+
- name: Run pre-commit
31+
id: precommit
32+
continue-on-error: true
33+
uses: pre-commit/action@v3.0.1
34+
35+
- name: Run author update script
36+
id: author-update
37+
continue-on-error: true
38+
run: |
39+
python3 buildbot/update_authors.py
40+
41+
- name: Check for changes
42+
id: check-changes
43+
run: |
44+
if [[ -n $(git status --porcelain) ]]; then
45+
echo "changes=true" >> $GITHUB_OUTPUT
46+
echo "Changes detected:"
47+
git status --short
48+
else
49+
echo "changes=false" >> $GITHUB_OUTPUT
50+
echo "No changes detected"
51+
fi
52+
53+
- name: Create Pull Request
54+
if: steps.check-changes.outputs.changes == 'true'
55+
uses: peter-evans/create-pull-request@v8
56+
with:
57+
token: ${{ secrets.GHACTION_PAT }}
58+
commit-message: "[autofix] automatic fix after main branch workflow fail"
59+
branch: "actions/autofix"
60+
delete-branch: true
61+
title: "[autofix] automatic fix after main branch workflow fail"
62+
labels: |
63+
autofix.ci
64+
trigger-ci
65+
body: |
66+
## Auto-generated fixes
67+
68+
This PR contains automatic fixes from pre-commit hooks and author updates.
69+
70+
**Triggered by**: ${{ github.event_name }} on `${{ github.ref_name }}`
71+
**Commit**: ${{ github.sha }}
72+
73+
### Changes:
74+
- Pre-commit hook fixes
75+
- Author information updates
76+
77+
Please review the changes before merging.
78+
79+
- name: Summary
80+
if: always()
81+
run: |
82+
echo "## Autofix PR Workflow Summary" >> $GITHUB_STEP_SUMMARY
83+
echo "" >> $GITHUB_STEP_SUMMARY
84+
if [[ "${{ steps.check-changes.outputs.changes }}" == "true" ]]; then
85+
echo "✅ Changes detected and PR created" >> $GITHUB_STEP_SUMMARY
86+
else
87+
echo "✅ No changes needed" >> $GITHUB_STEP_SUMMARY
88+
fi

.github/workflows/autofix.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: autofix.ci # needed to securely identify the workflow
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, labeled]
6+
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
9+
cancel-in-progress: ${{ github.ref_name != 'main' }}
10+
11+
permissions:
12+
contents: read
13+
14+
jobs:
15+
autofix:
16+
if: ${{ contains(github.event.pull_request.labels.*.name, 'autofix.ci') }}
17+
runs-on: ubuntu-latest
18+
env:
19+
FIX_MODE: "${{ contains(github.event.pull_request.labels.*.name, 'autofix.ci') && 'fix' || 'check' }}"
20+
steps:
21+
- uses: actions/checkout@v6
22+
with:
23+
fetch-depth: 0
24+
25+
- uses: actions/setup-python@v5
26+
with:
27+
python-version: '>=3.10'
28+
29+
- uses: pre-commit/action@v3.0.1
30+
continue-on-error: true
31+
32+
- name: "Run author update script"
33+
continue-on-error: true
34+
run: |
35+
python3 buildbot/update_authors.py
36+
37+
- name: Commit and push if changed
38+
if: env.FIX_MODE == 'fix'
39+
uses: autofix-ci/action@635ffb0c9798bd160680f18fd73371e355b85f27
40+
with:
41+
commit-message: '[autofix.ci] fix file authorship & pre-commit'

.github/workflows/build-and-push.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
build-and-push:
3737
name: ${{ inputs.imagename }}:${{ inputs.imagetag }}
38-
runs-on: ${{ inputs.runson }}
38+
runs-on: ${{ fromJSON(inputs.runson) }}
3939
permissions:
4040
contents: read
4141
packages: write
@@ -47,9 +47,15 @@ jobs:
4747
- name: Checkout repository
4848
uses: actions/checkout@v4
4949
with:
50+
path: repo
5051
fetch-depth: 0
5152
submodules: recursive
5253

54+
- name: Create repository archive
55+
run: |
56+
tar -czf repo.tar.gz -C repo .
57+
cp repo/${{ inputs.imagepath }}/Dockerfile .
58+
5359
# Install the cosign tool except on PR
5460
# https://github.com/sigstore/cosign-installer
5561
- name: Install cosign
@@ -98,7 +104,7 @@ jobs:
98104
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
99105
with:
100106
context: .
101-
file: ${{ inputs.imagepath }}/Dockerfile
107+
file: Dockerfile
102108
push: ${{ github.event_name != 'pull_request' }}
103109
tags: ${{ steps.meta.outputs.tags }}
104110
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-dockerfiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
imagename: shamrock
2626
imagetag: oneapi
2727
imagepath: .github/dockerfiles/intel_oneapi
28-
runson: ubuntu-latest
28+
runson: '["self-hosted", "docker-runner"]'
2929
usetagonlatest: false

0 commit comments

Comments
 (0)