From f33c8036145e1cb1ab18636f388868b3a5f34317 Mon Sep 17 00:00:00 2001 From: Adam Babik Date: Thu, 12 Jul 2018 11:45:31 +0200 Subject: [PATCH] make calculating GIT_REMOTE in Makefile more explicit (#1092) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0ceb66b81..135e34170 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ GOBIN=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))build/bin GIT_COMMIT := $(shell git rev-parse --short HEAD) GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) GIT_LOCAL := $(shell git rev-parse @) -GIT_REMOTE := $(shell git fetch -q && git rev-parse origin) +GIT_REMOTE := $(shell git fetch -q && git rev-parse remotes/origin/develop) BUILD_FLAGS ?= $(shell echo "-ldflags '-X main.buildStamp=`date -u '+%Y-%m-%d.%H:%M:%S'` -X github.com/status-im/status-go/params.VersionMeta=$(GIT_COMMIT)'") @@ -158,7 +158,7 @@ ifneq ("$(GIT_LOCAL)", "$(GIT_REMOTE)") echo "The local git commit does not match the remote origin!" exit 1 endif - docker push $(BOOTNODE_IMAGE_NAME):latest + docker push $(BOOTNODE_IMAGE_NAME):latest docker push $(DOCKER_IMAGE_NAME):latest xgo-docker-images: ##@docker Build xgo docker images