From 97494d78d2d527c98f2996ed3dd1502c480ba90a Mon Sep 17 00:00:00 2001
From: Sida Say <sida.say@khalibre.com>
Date: Tue, 5 Mar 2024 14:03:32 +0700
Subject: [PATCH] ci: fix blank tag on tag build

---
 .github/actions/docker-common/action.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/actions/docker-common/action.yml b/.github/actions/docker-common/action.yml
index bfa800b..5d5cf68 100644
--- a/.github/actions/docker-common/action.yml
+++ b/.github/actions/docker-common/action.yml
@@ -62,10 +62,10 @@ runs:
           khalibre/privacyidea
           ghcr.io/Khalibre/privacyidea
         tags: |
-          type=raw,value={{branch}}-python-${{ inputs.python_base_image }},enable=${{ github.event_name == 'push' && github.ref != format('refs/heads/{0}', 'main') }}
-          type=raw,value={{branch}},enable=${{ github.event_name == 'push' && github.ref != format('refs/heads/{0}', 'main') }}
-          type=raw,value={{tag}}-python-${{ inputs.python_base_image }},enable=${{ github.event_name == 'push' && github.event.ref_type == 'tag' }}
-          type=raw,value={{tag}},enable=${{ github.event_name == 'push' && inputs.is_default_version && github.event.ref_type == 'tag' }}
+          type=raw,value={{branch}}-python-${{ inputs.python_base_image }},enable=${{ github.event_name == 'push' && github.ref_type == 'branch' }}
+          type=raw,value={{branch}},enable=${{ github.event_name == 'push' && github.ref_type == 'branch' }}
+          type=raw,value={{tag}}-python-${{ inputs.python_base_image }},enable=${{ github.event_name == 'push' && github.ref_type == 'tag' }}
+          type=raw,value={{tag}},enable=${{ github.event_name == 'push' && inputs.is_default_version && github.ref_type == 'tag' }}
           type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') && inputs.is_default_version }}
           type=ref,event=pr,enable=${{ github.event_name == 'pull_request' }}
           type=sha,enable=${{ github.event_name == 'push' }}