Fix release name evaluation

2025-03-14 02:24:04 -03:00 · 2025-02-10 00:50:19 +03:00 · 2025-02-10 00:50:19 +03:00 · fdda229ae2
commit fdda229ae2
parent 264cdc5ca9
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -4,7 +4,9 @@ PYTHON ?= /usr/bin/python3
 OS_CODENAME ?= $(shell grep VERSION_CODENAME= /etc/os-release | cut -f2 -d=)

 ifneq ("$(wildcard .git)","")
-    RELEASE ?= $(or $(shell git describe --all --match master --match 'release-*' --abbrev=0 HEAD 2>/dev/null | sed 's@heads/@@g'), branch)
+    RELEASE ?= $(or $(shell git rev-parse --abbrev-ref HEAD | grep -v '^stable$$'),\
+                    $(shell git describe --all --match 'release-*' --match 'origin/release-*' --abbrev=0 HEAD 2>/dev/null | grep -o '[^/]*$$'),\
+                    unknown)
    COMMIT ?= $(shell git rev-parse HEAD)
    SOURCE_DATE_EPOCH ?= $(or $(shell git show -s --format="%ct" $(COMMIT)), $(shell date "+%s"))
    VERSION ?= $(shell $(PYTHON) ./version.py $(SOURCE_DATE_EPOCH) $(RELEASE))