status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

make calculating GIT_REMOTE in Makefile more explicit (#1092)

This commit is contained in:
Adam Babik 2018-07-12 11:45:31 +02:00 committed by GitHub
parent 985c0a1659
commit f33c803614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -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