Skip to content

Commit 65fdb28

Browse files
committed
fix: use the image id for tagging the latest [skip test]
1 parent e7e3464 commit 65fdb28

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ jobs:
273273
password: ${{ secrets.DOCKERHUB_TOKEN }}
274274

275275
- name: Build setup-cpp-${{matrix.container.distro }}
276+
id: build_base
276277
uses: docker/build-push-action@v6
277278
with:
278279
context: .
@@ -284,7 +285,7 @@ jobs:
284285
cache-to: type=inline
285286

286287
- name: Tag latest locally
287-
run: docker tag docker.io/aminya/${{ matrix.container.image }}:${{ matrix.container.tag }}-${{ steps.platform.outputs.suffix }} aminya/${{ matrix.container.image }}:latest
288+
run: docker tag ${{ steps.build_base.outputs.imageid }} aminya/${{ matrix.container.image }}:latest
288289

289290
- name: Push latest to Docker Hub
290291
if: ${{ github.event_name != 'pull_request' && matrix.container.distro != 'ubuntu' }}
@@ -300,6 +301,7 @@ jobs:
300301
readme-filepath: ./README_DOCKER.md
301302

302303
- name: Build setup-cpp-${{matrix.container.distro }}-llvm
304+
id: build_llvm
303305
uses: docker/build-push-action@v6
304306
with:
305307
context: .
@@ -311,7 +313,7 @@ jobs:
311313
cache-to: type=inline
312314

313315
- name: Tag latest locally
314-
run: docker tag docker.io/aminya/${{ matrix.container.image }}-llvm:${{ matrix.container.tag }}-${{ steps.platform.outputs.suffix }} aminya/${{ matrix.container.image }}-llvm:latest
316+
run: docker tag ${{ steps.build_llvm.outputs.imageid }} aminya/${{ matrix.container.image }}-llvm:latest
315317

316318
- name: Push latest to Docker Hub
317319
if: ${{ github.event_name != 'pull_request' && matrix.container.distro != 'ubuntu' }}
@@ -337,6 +339,7 @@ jobs:
337339
tags: aminya/test-${{ matrix.container.image }}-llvm:${{ matrix.container.tag }}
338340

339341
- name: Build setup-cpp-${{matrix.container.distro }}-gcc
342+
id: build_gcc
340343
uses: docker/build-push-action@v6
341344
with:
342345
context: .
@@ -348,7 +351,7 @@ jobs:
348351
cache-to: type=inline
349352

350353
- name: Tag latest locally
351-
run: docker tag docker.io/aminya/${{ matrix.container.image }}-gcc:${{ matrix.container.tag }}-${{ steps.platform.outputs.suffix }} aminya/${{ matrix.container.image }}-gcc:latest
354+
run: docker tag ${{ steps.build_gcc.outputs.imageid }} aminya/${{ matrix.container.image }}-gcc:latest
352355

353356
- name: Push latest to Docker Hub
354357
if: ${{ github.event_name != 'pull_request' && matrix.container.distro != 'ubuntu' }}
@@ -374,6 +377,7 @@ jobs:
374377
tags: aminya/test-${{ matrix.container.image }}-gcc:${{ matrix.container.tag }}
375378

376379
- name: Build setup-cpp-${{matrix.container.distro }}-mingw
380+
id: build_mingw
377381
if: ${{ !contains(matrix.container.distro, 'fedora') }}
378382
uses: docker/build-push-action@v6
379383
with:
@@ -386,7 +390,7 @@ jobs:
386390
cache-to: type=inline
387391

388392
- name: Tag latest locally
389-
run: docker tag docker.io/aminya/${{ matrix.container.image }}-mingw:${{ matrix.container.tag }}-${{ steps.platform.outputs.suffix }} aminya/${{ matrix.container.image }}-mingw:latest
393+
run: docker tag ${{ steps.build_mingw.outputs.imageid }} aminya/${{ matrix.container.image }}-mingw:latest
390394

391395
- name: Push latest to Docker Hub
392396
if: ${{ github.event_name != 'pull_request' && matrix.container.distro != 'ubuntu' }}

0 commit comments

Comments
 (0)