|
52 | 52 | # Per-arch build jobs |
53 | 53 | # =========================== |
54 | 54 | build_amd64: |
55 | | - name: Build amd64 from ${{ matrix.image }}:${{ matrix.image_tag }} |
| 55 | + name: Build amd64 from ${{ matrix.image }} |
56 | 56 | needs: [ overview, discover ] |
57 | 57 | runs-on: ubuntu-latest |
58 | 58 | permissions: |
@@ -84,13 +84,13 @@ jobs: |
84 | 84 | type=raw,value=${{ format('{0}-{1}', matrix.gemc_tag, matrix.osname) }} |
85 | 85 | labels: | |
86 | 86 | 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 }}) |
88 | 88 |
|
89 | 89 | - name: Generate Dockerfile |
90 | 90 | run: | |
91 | 91 | python3 ci/dockerfile_creator.py \ |
92 | 92 | -i "${{ matrix.image }}" \ |
93 | | - -t "${{ matrix.image_tag }}" \ |
| 93 | + -t "${{ matrix.gemc_tag }}" \ |
94 | 94 | > Dockerfile.generated |
95 | 95 | cat Dockerfile.generated |
96 | 96 |
|
@@ -146,13 +146,13 @@ jobs: |
146 | 146 | if: ${{ always() }} |
147 | 147 | uses: actions/upload-artifact@v4 |
148 | 148 | with: |
149 | | - name: summary-${{ matrix.image }}-${{ matrix.image_tag }}-amd64 |
| 149 | + name: summary-${{ matrix.gemc_tag }}-${{ matrix.osname }}-amd64 |
150 | 150 | path: ${{ runner.temp }}/summary.md |
151 | 151 | if-no-files-found: ignore |
152 | 152 |
|
153 | 153 | # build_arm64 job header |
154 | 154 | build_arm64: |
155 | | - name: Build arm64 from ${{ matrix.image }}:${{ matrix.image_tag }} |
| 155 | + name: Build arm64 from ${{ matrix.image }} |
156 | 156 | needs: [overview, discover] |
157 | 157 | runs-on: ubuntu-24.04-arm # <— use native ARM64 runner |
158 | 158 | permissions: |
@@ -194,14 +194,14 @@ jobs: |
194 | 194 | type=raw,value=${{ format('{0}-{1}', matrix.gemc_tag, matrix.osname) }} |
195 | 195 | labels: | |
196 | 196 | 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 }}) |
198 | 198 |
|
199 | 199 | - name: Generate Dockerfile |
200 | 200 | if: ${{ matrix.image != 'archlinux' }} |
201 | 201 | run: | |
202 | 202 | python3 ci/dockerfile_creator.py \ |
203 | 203 | -i "${{ matrix.image }}" \ |
204 | | - -t "${{ matrix.image_tag }}" \ |
| 204 | + -t "${{ matrix.gemc_tag }}" \ |
205 | 205 | > Dockerfile.generated |
206 | 206 | cat Dockerfile.generated |
207 | 207 |
|
@@ -270,7 +270,7 @@ jobs: |
270 | 270 | shell: bash |
271 | 271 | env: |
272 | 272 | 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) }} |
274 | 274 | run: | |
275 | 275 | : "${GITHUB_STEP_SUMMARY:=$RUNNER_TEMP/manifest_summary.md}" |
276 | 276 | { |
@@ -300,14 +300,14 @@ jobs: |
300 | 300 |
|
301 | 301 | # Also save a copy inside the workspace for artifact upload |
302 | 302 | 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" |
305 | 305 | ls -l "$GITHUB_WORKSPACE/summaries" |
306 | 306 |
|
307 | 307 | - name: Upload summary artifact (manifest) |
308 | 308 | if: ${{ always() }} |
309 | 309 | uses: actions/upload-artifact@v4 |
310 | 310 | with: |
311 | | - name: summary-${{ matrix.image }}-${{ matrix.image_tag }}-manifest |
| 311 | + name: summary-${{ matrix.gemc_tag }}-${{ matrix.image }}-manifest |
312 | 312 | path: ${{ runner.temp }}/manifest_summary.md |
313 | 313 | if-no-files-found: ignore |
0 commit comments