From 889ee1541f65d74c65c36ea019cb8f2ae847a4e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Martins?= Date: Fri, 18 Nov 2022 16:40:34 +0100 Subject: [PATCH] .github/workflows: split the image tag update in two steps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the images are not created, because they are already available in the docker image repository, they will have an empty image digest set and the image tag replacement will wrongly use this empty digest. Fixes: c5a778723a43 ("add auto-commit capability to build base images GH workflow") Signed-off-by: André Martins --- .github/workflows/build-images-base.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-images-base.yaml b/.github/workflows/build-images-base.yaml index 95a3850d8f5f9..dbc8b5b59d939 100644 --- a/.github/workflows/build-images-base.yaml +++ b/.github/workflows/build-images-base.yaml @@ -183,10 +183,14 @@ jobs: path: image-digest retention-days: 1 - - name: Update Runtime and Builder Images - if: ${{ steps.cilium-builder-tag-in-repositories.outputs.exists == 'false' || steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' }} + - name: Update Runtime Images + if: ${{ steps.cilium-runtime-tag-in-repositories.outputs.exists == 'false' }} run: | images/runtime/update-cilium-runtime-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-runtime:${{ steps.runtime-tag.outputs.tag }}@${{ steps.docker_build_release_runtime.outputs.digest }}" + + - name: Update Builder Images + if: ${{ steps.cilium-builder-tag-in-repositories.outputs.exists == 'false' }} + run: | images/builder/update-cilium-builder-image.sh "quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/cilium-builder:${{ steps.builder-tag.outputs.tag }}@${{ steps.docker_build_release_builder.outputs.digest }}" - name: Commit changes by amending previous commit