diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-03-23 13:41:51 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-03-23 13:41:51 +0200 |
| commit | b879d9ea5969a54b99e0780e699c4e72f3c9a78c (patch) | |
| tree | 11c455f977a30edb4071843ec61757e0b25f7785 | |
| parent | 2d86411446b307b772da76f25ff5b5080533f3a5 (diff) | |
| download | aports-b879d9ea5969a54b99e0780e699c4e72f3c9a78c.tar.bz2 aports-b879d9ea5969a54b99e0780e699c4e72f3c9a78c.tar.xz | |
build: inspect GitLab CI variables for version string
| -rw-r--r-- | Make.rules | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Make.rules b/Make.rules index acd566f978..23cf3c28e1 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 |