From 49f83754e9dedd54666943030ecf3a345e7faaa2 Mon Sep 17 00:00:00 2001 From: leovct Date: Thu, 28 Nov 2024 14:18:19 +0100 Subject: [PATCH 1/2] docker: allow to push new versions of the zkevm-contracts images --- .github/workflows/docker-image-builder.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-image-builder.yml b/.github/workflows/docker-image-builder.yml index 021fa760..e2e55895 100644 --- a/.github/workflows/docker-image-builder.yml +++ b/.github/workflows/docker-image-builder.yml @@ -38,19 +38,9 @@ jobs: fi echo "full_tag=$FULL_TAG" >> $GITHUB_OUTPUT - - name: Check if image already exists - id: check_image - run: | - if docker manifest inspect ${{ env.IMAGE_NAME }}:${{ steps.determine_tag.outputs.full_tag }} > /dev/null 2>&1; then - echo "Image already exists, skipping build." - echo "exists=true" >> $GITHUB_OUTPUT - else - echo "Image does not exist." - echo "exists=false" >> $GITHUB_OUTPUT - fi - + # We don't check if the image already exists to be able to push new versions of the images + # in case of a dependency breaking change (e.g. foundry). - name: Build image and push to the Docker Hub - if: ${{ steps.check_image.outputs.exists == 'false' }} uses: docker/build-push-action@v6 with: context: docker From 3890c9feab457c925f26ce8251309dd7616a5861 Mon Sep 17 00:00:00 2001 From: leovct Date: Thu, 28 Nov 2024 16:05:42 +0100 Subject: [PATCH 2/2] docker: label fork10 tags as fork11 --- .github/workflows/docker-image-builder.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-builder.yml b/.github/workflows/docker-image-builder.yml index e2e55895..1fe2c808 100644 --- a/.github/workflows/docker-image-builder.yml +++ b/.github/workflows/docker-image-builder.yml @@ -29,9 +29,14 @@ jobs: id: determine_tag run: | TAG=${{ github.event.inputs.zkevm_contracts_version }} - if [[ $TAG == *pp ]]; then + if [[ $TAG == *-fork.10 ]]; then + # Custom rule to label fork10 tags as fork11. + FULL_TAG="${TAG%-fork.10}-fork.11" + elif [[ $TAG == *pp ]]; then + # Custom rule to label pp tags as fork12. FULL_TAG="${TAG}-fork.12" elif [[ $TAG != *-fork.[0-9]* ]]; then + # Custom rule to label undefined tags as fork13. FULL_TAG="${TAG}-fork.13" else FULL_TAG=$TAG