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

use BRANCH from TRAVIS_BRANCH

Browse Source
This commit is contained in:
Thomas Bernard 2018-07-07 13:33:57 +02:00
parent 1910637d91
commit 28249f13b5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -38,9 +38,13 @@ ifeq (true,$(shell git rev-parse --is-inside-work-tree))
GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..) GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..)
ifneq (,$(CI_COMMIT_REF_NAME)) ifneq (,$(CI_COMMIT_REF_NAME))
GIT_BRANCH = $(CI_COMMIT_REF_NAME) GIT_BRANCH = $(CI_COMMIT_REF_NAME)
else
ifneq (,$(TRAVIS_BRANCH))
GIT_BRANCH = $(TRAVIS_BRANCH)
else else
GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD) GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
endif endif
endif
ifneq (master,$(GIT_BRANCH)) ifneq (master,$(GIT_BRANCH))
GIT_REVISION := $(GIT_REVISION)-$(GIT_BRANCH) GIT_REVISION := $(GIT_REVISION)-$(GIT_BRANCH)
endif endif