ZeroDownTime/sns-alert-hub
3
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Squashed '.ci/' changes from cdc32e0..5023473

Browse Source 
5023473 Make branch detection work for tagged commits

git-subtree-dir: .ci
git-subtree-split: 50234738d04b5b26d9e067fed0e58e98931c2e9b
This commit is contained in:
Stefan Reimer 2023-08-15 10:26:56 +01:00
parent 0152d90502
commit 6d421cefd1
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)))