From beefe5af5b75d4beb0f2ffac4940dc08d6bd5cfd Mon Sep 17 00:00:00 2001 From: Christian Geller <88664444+cgeller@users.noreply.github.com> Date: Wed, 31 Jan 2024 17:48:37 +0100 Subject: [PATCH 1/5] Use github.ref_name --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index dc6022537..aa79912d5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -47,7 +47,7 @@ jobs: - name: Set image tag run: | echo "IMAGE_TAG_SUFFIX=_$(echo '${{ github.ref_name }}' | tr / -)_ci" >> $GITHUB_ENV - if: github.ref.name != github.event.repository.default_branch + if: github.ref_name != "tagging" - uses: docker/build-push-action@v5 name: Build and push From cae6894b886f4e0f7ed27ddb096e723db965b285 Mon Sep 17 00:00:00 2001 From: Christian Geller <88664444+cgeller@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:12:41 +0100 Subject: [PATCH 2/5] Change syntax of workflow rule --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index aa79912d5..eb9df4bf5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -47,7 +47,7 @@ jobs: - name: Set image tag run: | echo "IMAGE_TAG_SUFFIX=_$(echo '${{ github.ref_name }}' | tr / -)_ci" >> $GITHUB_ENV - if: github.ref_name != "tagging" + if: ${{ github.ref_name != 'tagging' }} - uses: docker/build-push-action@v5 name: Build and push From b5d91552c6ea79f04dc60b0309decd005c1081c6 Mon Sep 17 00:00:00 2001 From: Christian Geller <88664444+cgeller@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:18:11 +0100 Subject: [PATCH 3/5] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eb9df4bf5..489d2b71d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -47,7 +47,7 @@ jobs: - name: Set image tag run: | echo "IMAGE_TAG_SUFFIX=_$(echo '${{ github.ref_name }}' | tr / -)_ci" >> $GITHUB_ENV - if: ${{ github.ref_name != 'tagging' }} + if: github.ref.name == 'tagging' - uses: docker/build-push-action@v5 name: Build and push From d2f755947ba6db95ead76204bdf59850ad7b2b62 Mon Sep 17 00:00:00 2001 From: Christian Geller <88664444+cgeller@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:20:19 +0100 Subject: [PATCH 4/5] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 489d2b71d..02ad62ef8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -47,7 +47,7 @@ jobs: - name: Set image tag run: | echo "IMAGE_TAG_SUFFIX=_$(echo '${{ github.ref_name }}' | tr / -)_ci" >> $GITHUB_ENV - if: github.ref.name == 'tagging' + if: github.ref_name == 'tagging' - uses: docker/build-push-action@v5 name: Build and push From d3e677fd429573d3ae3cf445164d40d3aa5f2db6 Mon Sep 17 00:00:00 2001 From: Christian Geller <88664444+cgeller@users.noreply.github.com> Date: Wed, 31 Jan 2024 18:23:52 +0100 Subject: [PATCH 5/5] Update docker.yml --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 02ad62ef8..e50eaa7c4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -47,7 +47,7 @@ jobs: - name: Set image tag run: | echo "IMAGE_TAG_SUFFIX=_$(echo '${{ github.ref_name }}' | tr / -)_ci" >> $GITHUB_ENV - if: github.ref_name == 'tagging' + if: github.ref_name != github.event.repository.default_branch - uses: docker/build-push-action@v5 name: Build and push