From 0f3f7261e2332b21f6929f3d204ee573496d48a7 Mon Sep 17 00:00:00 2001 From: Jaspar Stach Date: Tue, 8 Oct 2024 14:11:49 +0200 Subject: [PATCH] Fix: tagging one more time --- .github/workflows/container-build-push-2nd-gen.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/container-build-push-2nd-gen.yml b/.github/workflows/container-build-push-2nd-gen.yml index 9a7b2f2..63424b4 100644 --- a/.github/workflows/container-build-push-2nd-gen.yml +++ b/.github/workflows/container-build-push-2nd-gen.yml @@ -199,6 +199,7 @@ jobs: id: conditions run: | echo "ENABLE_STABLE=${{ github.event_name != 'workflow_dispatch' && (needs.build-amd64.outputs.is-latest-tag == 'true') && (inputs.base-image-label == 'stable')}}" >> $GITHUB_OUTPUT + echo "branch=${{ steps.branch.outputs.branch }}" - name: Generate Docker metadata id: meta @@ -212,11 +213,11 @@ jobs: type=semver,pattern={{version}},enable=${{ steps.conditions.outputs.ENABLE_STABLE }} type=semver,pattern={{major}},enable=${{ steps.conditions.outputs.ENABLE_STABLE }} type=semver,pattern={{major}}.{{minor}},enable=${{ steps.conditions.outputs.ENABLE_STABLE }} - type=semver,pattern={{version}},value=${{ inputs.ref-name }},enable=${{ github.event_name == 'workflow_dispatch' && (inputs.base-image-label == 'stable') }} - type=semver,pattern={{major}}.{{minor}},value=${{ inputs.ref-name }},enable=${{ github.event_name == 'workflow_dispatch' && (inputs.base-image-label == 'stable') }} - type=semver,pattern={{major}},value=${{ inputs.ref-name }},enable=${{ github.event_name == 'workflow_dispatch' && (inputs.base-image-label == 'stable') }} + type=semver,pattern={{version}},value=${{ inputs.ref-name }},enable=${{ github.event_name == 'workflow_dispatch' && (inputs.base-image-label == 'stable') }} + type=semver,pattern={{major}}.{{minor}},value=${{ inputs.ref-name }},enable=${{ github.event_name == 'workflow_dispatch' && (inputs.base-image-label == 'stable') }} + type=semver,pattern={{major}},value=${{ inputs.ref-name }},enable=${{ github.event_name == 'workflow_dispatch' && (inputs.base-image-label == 'stable') }} - type=raw,value=edge,enable=${{ (steps.branch.outputs.branch == 'main') && (inputs.base-image-label == 'stable') }} + type=raw,value=edge,enable=${{(github.event_name != 'workflow_dispatch') && (steps.branch.outputs.branch == 'main') && (inputs.base-image-label == 'stable') }} type=raw,value=oldstable,enable=${{ (needs.build-amd64.outputs.is-latest-tag == 'true') && (inputs.base-image-label == 'oldstable') }} type=raw,value=oldstable-edge,enable=${{ (steps.branch.outputs.branch == 'main') && (inputs.base-image-label == 'oldstable') }}