Skip to content

Commit 264cdc5

Browse files
committed
Fix release name evaluation
1 parent 84b1719 commit 264cdc5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PYTHON ?= /usr/bin/python3
44
OS_CODENAME ?= $(shell grep VERSION_CODENAME= /etc/os-release | cut -f2 -d=)
55

66
ifneq ("$(wildcard .git)","")
7-
RELEASE ?= $(shell git describe --all --match master --match 'release-*' --abbrev=0 HEAD | sed 's@heads/@@g')
7+
RELEASE ?= $(or $(shell git describe --all --match master --match 'release-*' --abbrev=0 HEAD 2>/dev/null | sed 's@heads/@@g'), branch)
88
COMMIT ?= $(shell git rev-parse HEAD)
99
SOURCE_DATE_EPOCH ?= $(or $(shell git show -s --format="%ct" $(COMMIT)), $(shell date "+%s"))
1010
VERSION ?= $(shell $(PYTHON) ./version.py $(SOURCE_DATE_EPOCH) $(RELEASE))

0 commit comments

Comments
 (0)