summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2020-03-23 13:41:51 +0200
committerTimo Teräs <timo.teras@iki.fi>2020-03-23 13:41:51 +0200
commitb879d9ea5969a54b99e0780e699c4e72f3c9a78c (patch)
tree11c455f977a30edb4071843ec61757e0b25f7785
parent2d86411446b307b772da76f25ff5b5080533f3a5 (diff)
downloadapk-tools-b879d9ea5969a54b99e0780e699c4e72f3c9a78c.tar.gz
apk-tools-b879d9ea5969a54b99e0780e699c4e72f3c9a78c.tar.bz2
apk-tools-b879d9ea5969a54b99e0780e699c4e72f3c9a78c.tar.xz
apk-tools-b879d9ea5969a54b99e0780e699c4e72f3c9a78c.zip
build: inspect GitLab CI variables for version string
-rw-r--r--Make.rules12
1 files changed, 9 insertions, 3 deletions
diff --git a/Make.rules b/Make.rules
index acd566f..23cf3c2 100644
--- a/Make.rules
+++ b/Make.rules
@@ -53,9 +53,15 @@ export srctree objtree
TAGPREFIX ?= v
-GIT_REV := $(shell test -d .git && git describe || echo exported)
-ifneq ($(GIT_REV), exported)
-FULL_VERSION := $(patsubst $(TAGPREFIX)%,%,$(GIT_REV))
+ifneq ($(CI_COMMIT_TAG),)
+FULL_VERSION := $(CI_COMMIT_TAG)
+else ifneq ($(CI_COMMIT_REF_NAME),)
+# GitLab but no tag info, use the 'git describe' from environment variable
+# once https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1633
+# gets completed and merged upstream.
+FULL_VERSION := $(VERSION)
+else ifneq ($(wildcard .git),)
+FULL_VERSION := $(patsubst $(TAGPREFIX)%,%,$(shell git describe))
else
FULL_VERSION := $(VERSION)
endif