From e022db091c92e85c9d7aa692d045a4512fa7b97f Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 17 Apr 2025 22:37:10 +0000 Subject: [PATCH] Squashed '.ci/' changes from 15e4d1f5..a5cd89d7 a5cd89d7 feat: improve tag parsing, ensure dirty is added if needed git-subtree-dir: .ci git-subtree-split: a5cd89d73157c829eaf12f91a68f73826fbb35e7 --- podman.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/podman.mk b/podman.mk index ed5aa268..59286e2c 100644 --- a/podman.mk +++ b/podman.mk @@ -8,8 +8,8 @@ SHELL := bash .PHONY: all # All targets are accessible for user .DEFAULT: help # Running Make will run the help target -# Parse version from latest git semver tag -GIT_TAG ?= $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) +# Parse version from latest git semver tag, use short commit otherwise +GIT_TAG ?= $(shell git describe --tags --match v*.*.* --dirty 2>/dev/null || git describe --match="" --always --dirty 2>/dev/null) GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) TAG ::= $(GIT_TAG)