From ef9da6c1611d3e5fdb69864e758aa8e95db781a4 Mon Sep 17 00:00:00 2001
From: "Maxim [maxirmx] Samsonov" <m.samsonov@computer.org>
Date: Fri, 17 Jan 2025 21:40:00 +0300
Subject: [PATCH] fix: yet another docker/metadata-action setup

---
 .github/workflows/add-tag.yml          |  4 ----
 .github/workflows/build-containers.yml | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/add-tag.yml b/.github/workflows/add-tag.yml
index 39c0a78..e433e13 100644
--- a/.github/workflows/add-tag.yml
+++ b/.github/workflows/add-tag.yml
@@ -24,7 +24,3 @@ jobs:
           git push origin ${{ github.event.client_payload.tag }}
         env:
           GITHUB_TOKEN: ${{ secrets.TEBAKO_CI_PAT_TOKEN }}
-
-      - name: Set output
-        id: set_output
-        run: echo "::set-output name=tag::v${{ github.event.client_payload.tag }}"
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index 60f3011..cfdcf74 100644
--- a/.github/workflows/build-containers.yml
+++ b/.github/workflows/build-containers.yml
@@ -38,8 +38,12 @@ jobs:
       - name: Set GITHUB_REF
         if: github.event_name == 'workflow_run'
         run: |
-          echo "Setting GITHUB_REF to refs/tags/$(git tag --sort=-v:refname | grep -v '\.rc[0-9]\+$' | head -n 1)"
-          echo "GITHUB_REF=refs/tags/$(git tag --sort=-v:refname | grep -v '\.rc[0-9]\+$' | head -n 1)" >> $GITHUB_ENV
+          TAG=$(git tag --sort=-v:refname | grep -v '\.rc[0-9]\+$' | head -n 1)
+          VERSION=${TAG#v}
+          echo "Setting VERSION to $VERSION"
+          echo "Setting GITHUB_REF to refs/tags/$TAG"
+          echo "GITHUB_REF=refs/tags/$TAG" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Log in to the Container registry
         uses: docker/login-action@v3
@@ -55,9 +59,12 @@ jobs:
           images: |
             ghcr.io/tamatebako/tebako-${{ matrix.container }}
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern={{version}},value=${{ env.VERSION }},enable=${{ github.event_name == 'workflow_run' }}
+            type=semver,pattern={{version}},enable=${{ github.event_name != 'workflow_run' }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ env.VERSION }},enable=${{ github.event_name == 'workflow_run' }}
+            type=semver,pattern={{major}}.{{minor}},enable=${{ github.event_name != 'workflow_run' }}
+            type=semver,pattern={{major}},value=${{ env.VERSION }},enable=${{ github.event_name == 'workflow_run' }}
+            type=semver,pattern={{major}},enable=${{ github.event_name != 'workflow_run' }}
             type=sha
           labels: |
             org.opencontainers.image.vendor=Ribose Inc.