ZeroDownTime/ci-tools-lib
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make branch detection work for tagged commits

Browse Source
This commit is contained in:
Stefan Reimer 2023-08-15 09:26:22 +00:00
parent cdc32e01ea
commit 50234738d0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
podman.mk
View File

@ -1,7 +1,12 @@
# Parse version from latest git semver tag # Parse version from latest git semver tag
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) GIT_TAG := $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short 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')
# if "tags/" is in the branchname we are actually on a tag and need to use rev-parse instead
ifeq ($(findstring tags/, $(GIT_TAG)),)
GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
endif
TAG := $(GIT_TAG) TAG := $(GIT_TAG)
# append branch name to tag if NOT main nor master # append branch name to tag if NOT main nor master
ifeq (,$(filter main master, $(GIT_BRANCH))) ifeq (,$(filter main master, $(GIT_BRANCH)))