From b879d9ea5969a54b99e0780e699c4e72f3c9a78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 23 Mar 2020 13:41:51 +0200
Subject: [PATCH] build: inspect GitLab CI variables for version string

---
 Make.rules | 12 +++++++++---
 1 file 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