m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly set GIT_BRANCH when building on gitlab-ci

Browse Source 
https://docs.gitlab.com/ce/ci/variables/README.html
CI_COMMIT_REF_NAME

Signed-off-by: Thomas Bernard <miniupnp@free.fr>
This commit is contained in:
Thomas Bernard 2018-05-14 00:00:48 +02:00
parent af22ed7333
commit 994b950616
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -35,7 +35,11 @@
# Detect GIT revision # Detect GIT revision
GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..) GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..)
GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD) ifneq (,$(CI_COMMIT_REF_NAME))
GIT_BRANCH = $(CI_COMMIT_REF_NAME)
else
GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
endif
ifneq (master,$(GIT_BRANCH)) ifneq (master,$(GIT_BRANCH))
GIT_REVISION := "$(GIT_REVISION)-$(GIT_BRANCH)" GIT_REVISION := "$(GIT_REVISION)-$(GIT_BRANCH)"
endif endif