From 5d315359aa1a6bc7b253656094685575cb6c31ee Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Thu, 30 Sep 2021 00:31:00 +0200 Subject: [PATCH] gitrev.mk: use gitlab-ci predefined variables --- miniupnpd/gitrev.mk | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/miniupnpd/gitrev.mk b/miniupnpd/gitrev.mk index fa09314..f1a529c 100644 --- a/miniupnpd/gitrev.mk +++ b/miniupnpd/gitrev.mk @@ -1,8 +1,23 @@ -# (c) 2019-2020 Thomas Bernard +# (c) 2019-2021 Thomas Bernard # For GNU Make +# CI_COMMIT_TAG / CI_COMMIT_BRANCH / CI_COMMIT_SHORT_SHA are gitlab-ci +# predefined variables +# see https://docs.gitlab.com/ee/ci/variables/predefined_variables.html +ifneq ($(CI_COMMIT_TAG),) +GITREF = $(CI_COMMIT_TAG) +else +ifneq ($(CI_COMMIT_BRANCH),) +GITREF = $(CI_COMMIT_BRANCH)-$(CI_COMMIT_SHORT_SHA) +else ISGITREPO := $(shell git rev-parse --is-inside-work-tree) ifeq ($(ISGITREPO),true) +# or - GITREF := $(shell git describe --exact-match --tags 2> /dev/null || echo "`git rev-parse --abbrev-ref HEAD`-`git rev-parse --short HEAD`" ) +endif +endif +endif + +ifneq ($(GITREF),) CPPFLAGS += -DMINIUPNPD_GIT_REF=\"$(GITREF)\" endif