Skip to content

Commit 19d8c01

Browse files
committed
tags changes in build workflow
1 parent 110092c commit 19d8c01

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/build_and_test.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
# Per-arch build jobs
5353
# ===========================
5454
build_amd64:
55-
name: Build amd64 from ${{ matrix.image }}:${{ matrix.image_tag }}
55+
name: Build amd64 from ${{ matrix.image }}
5656
needs: [ overview, discover ]
5757
runs-on: ubuntu-latest
5858
permissions:
@@ -84,13 +84,13 @@ jobs:
8484
type=raw,value=${{ format('{0}-{1}', matrix.gemc_tag, matrix.osname) }}
8585
labels: |
8686
org.opencontainers.image.source=${{ github.repository }}
87-
org.opencontainers.image.description=GEMC image (${{ matrix.gemc_tag }}, Geant4: ${{ matrix.geant4_tag }}) on ${{ matrix.image }}): ${{ matrix.image_tag }}
87+
org.opencontainers.image.description=GEMC image (${{ matrix.gemc_tag }}, Geant4: ${{ matrix.geant4_tag }}) on ${{ matrix.image }})
8888
8989
- name: Generate Dockerfile
9090
run: |
9191
python3 ci/dockerfile_creator.py \
9292
-i "${{ matrix.image }}" \
93-
-t "${{ matrix.image_tag }}" \
93+
-t "${{ matrix.gemc_tag }}" \
9494
> Dockerfile.generated
9595
cat Dockerfile.generated
9696
@@ -146,13 +146,13 @@ jobs:
146146
if: ${{ always() }}
147147
uses: actions/upload-artifact@v4
148148
with:
149-
name: summary-${{ matrix.image }}-${{ matrix.image_tag }}-amd64
149+
name: summary-${{ matrix.gemc_tag }}-${{ matrix.osname }}-amd64
150150
path: ${{ runner.temp }}/summary.md
151151
if-no-files-found: ignore
152152

153153
# build_arm64 job header
154154
build_arm64:
155-
name: Build arm64 from ${{ matrix.image }}:${{ matrix.image_tag }}
155+
name: Build arm64 from ${{ matrix.image }}
156156
needs: [overview, discover]
157157
runs-on: ubuntu-24.04-arm # <— use native ARM64 runner
158158
permissions:
@@ -194,14 +194,14 @@ jobs:
194194
type=raw,value=${{ format('{0}-{1}', matrix.gemc_tag, matrix.osname) }}
195195
labels: |
196196
org.opencontainers.image.source=${{ github.repository }}
197-
org.opencontainers.image.description=GEMC image (${{ matrix.gemc_tag }}, Geant4: ${{ matrix.geant4_tag }}) on ${{ matrix.image }}): ${{ matrix.image_tag }}
197+
org.opencontainers.image.description=GEMC image (${{ matrix.gemc_tag }}, Geant4: ${{ matrix.geant4_tag }}) on ${{ matrix.image }})
198198
199199
- name: Generate Dockerfile
200200
if: ${{ matrix.image != 'archlinux' }}
201201
run: |
202202
python3 ci/dockerfile_creator.py \
203203
-i "${{ matrix.image }}" \
204-
-t "${{ matrix.image_tag }}" \
204+
-t "${{ matrix.gemc_tag }}" \
205205
> Dockerfile.generated
206206
cat Dockerfile.generated
207207
@@ -270,7 +270,7 @@ jobs:
270270
shell: bash
271271
env:
272272
IMAGE: ${{ needs.discover.outputs.image }}
273-
TAG: ${{ format('{0}-{1}-{2}', matrix.geant4_tag, matrix.image, matrix.image_tag) }}
273+
TAG: ${{ format('{0}-{1}', matrix.gemc_tag, matrix.image) }}
274274
run: |
275275
: "${GITHUB_STEP_SUMMARY:=$RUNNER_TEMP/manifest_summary.md}"
276276
{
@@ -300,14 +300,14 @@ jobs:
300300
301301
# Also save a copy inside the workspace for artifact upload
302302
mkdir -p "$GITHUB_WORKSPACE/summaries"
303-
cp "$GITHUB_STEP_SUMMARY" "$GITHUB_WORKSPACE/summaries/summary-${{ matrix.image }}-${{ matrix.image_tag }}-${{ job.status }}.md" || true
304-
echo "Wrote $GITHUB_WORKSPACE/summaries/summary-${{ matrix.image }}-${{ matrix.image_tag }}.md"
303+
cp "$GITHUB_STEP_SUMMARY" "$GITHUB_WORKSPACE/summaries/summary-${{ matrix.gemc_tag }}-${{ matrix.image }}-${{ job.status }}.md" || true
304+
echo "Wrote $GITHUB_WORKSPACE/summaries/summary-${{ matrix.gemc_tag }}-${{ matrix.image }}.md"
305305
ls -l "$GITHUB_WORKSPACE/summaries"
306306
307307
- name: Upload summary artifact (manifest)
308308
if: ${{ always() }}
309309
uses: actions/upload-artifact@v4
310310
with:
311-
name: summary-${{ matrix.image }}-${{ matrix.image_tag }}-manifest
311+
name: summary-${{ matrix.gemc_tag }}-${{ matrix.image }}-manifest
312312
path: ${{ runner.temp }}/manifest_summary.md
313313
if-no-files-found: ignore

0 commit comments

Comments
 (0)