From e7e9a0a647d7794101af283bdaf7e8fc981a3242 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 22 Dec 2022 14:15:41 +0000 Subject: [PATCH] ci: fix tagging --- .ci/podman.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.ci/podman.mk b/.ci/podman.mk index bde15f6..2ab4469 100644 --- a/.ci/podman.mk +++ b/.ci/podman.mk @@ -5,7 +5,9 @@ GIT_TAG := $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-par # append branch name to tag if NOT main nor master TAG := $(GIT_TAG) ifeq (,$(filter main master, $(GIT_BRANCH))) - TAG = $(GIT_TAG)-$(GIT_BRANCH) + ifneq ($(GIT_TAG), $(GIT_BRANCH)) + TAG = $(GIT_TAG)-$(GIT_BRANCH) + endif endif # optionally set by the caller