From 4fcdb50928e0eea5a8bfc5dfa366caef1fa7a12b Mon Sep 17 00:00:00 2001 From: Luke Powlett Date: Thu, 8 Oct 2020 11:55:11 +0100 Subject: [PATCH] Use travis branch instead of current branch --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c261a9e..092aac7 100644 --- a/Makefile +++ b/Makefile @@ -122,8 +122,6 @@ ifneq "$(RELEASE)" "$(EMPTY)" MQ_MANIFEST_TAG=$(MQ_VERSION)-$(RELEASE)-$(RELEASE_CANDIDATE) endif -CURRENT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) - ifeq "$(TIMESTAMPFLAT)" "$(EMPTY)" TIMESTAMPFLAT=$(shell date "+%Y%m%d%H%M%S") endif @@ -132,7 +130,7 @@ ifeq "$(GIT_COMMIT)" "$(EMPTY)" GIT_COMMIT=$(shell git rev-parse --short HEAD) endif -ifeq ($(shell [ ! -z $(TRAVIS) ] && [ "$(TRAVIS_PULL_REQUEST)" != "true" ] && [ "$(CURRENT_BRANCH)" == "private-master" ] && echo true), true) +ifeq ($(shell [ ! -z $(TRAVIS) ] && [ "$(TRAVIS_PULL_REQUEST)" != "true" ] && [ "$(TRAVIS_BRANCH)" = "private-master" ] && echo true), true) RELEASE_TAG=$(shell [ -z "$(RELEASE)" ] || echo "-$(RELEASE)-$(RELEASE_CANDIDATE)") MQ_TAG=$(MQ_VERSION)$(RELEASE_TAG)-$(ARCH).$(TIMESTAMPFLAT).$(GIT_COMMIT) MQ_MANIFEST_TAG=$(MQ_VERSION)$(RELEASE_TAG).$(TIMESTAMPFLAT).$(GIT_COMMIT)