From 28249f13b510146a449cddc1b892b978ab1dbc9d Mon Sep 17 00:00:00 2001 From: Thomas Bernard Date: Sat, 7 Jul 2018 13:33:57 +0200 Subject: [PATCH] use BRANCH from TRAVIS_BRANCH --- src/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Makefile b/src/Makefile index 32d477c3..42a55181 100644 --- a/src/Makefile +++ b/src/Makefile @@ -38,9 +38,13 @@ ifeq (true,$(shell git rev-parse --is-inside-work-tree)) GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..) ifneq (,$(CI_COMMIT_REF_NAME)) GIT_BRANCH = $(CI_COMMIT_REF_NAME) + else + ifneq (,$(TRAVIS_BRANCH)) + GIT_BRANCH = $(TRAVIS_BRANCH) else GIT_BRANCH = $(shell git rev-parse --abbrev-ref HEAD) endif + endif ifneq (master,$(GIT_BRANCH)) GIT_REVISION := $(GIT_REVISION)-$(GIT_BRANCH) endif