From c476640823d9aef8e10f04630f498c84b48c7a11 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 7 Aug 2023 21:55:28 +0000 Subject: [PATCH] Squashed '.ci/' changes from 79eebe4..0821e91 0821e91 Ensure tag names are valid for remote branches like PRs git-subtree-dir: .ci git-subtree-split: 0821e910f5ea6bbf6645c9b10ea4540d51d3f15f --- podman.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/podman.mk b/podman.mk index 3554fd3..af1ce40 100644 --- a/podman.mk +++ b/podman.mk @@ -1,5 +1,5 @@ # Parse version from latest git semver tag -GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) +GIT_BRANCH ?= $(shell git name-rev --name-only HEAD 2>/dev/null | sed -e 's,remotes/origin/,,' -e 's/[^a-zA-Z0-9]/-/g') GIT_TAG := $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) TAG := $(GIT_TAG)