From 98012fde160798c79d868bc0ebff70af7d224eef Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 1 Apr 2020 18:22:31 +0300 Subject: [PATCH 1/2] Makefile: set config.Version properly After refactoring in 5a984fd (#423) Version has moved to pkg/. Makefile should be changed accordingly. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1ee80c955..b0077b4e8 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DC_FILE=.docker/docker-compose.yml REPO ?= "$(shell go list -m)" VERSION ?= "$(shell git describe --tags 2>/dev/null | sed 's/^v//')" -BUILD_FLAGS = "-X $(REPO)/config.Version=$(VERSION)" +BUILD_FLAGS = "-X $(REPO)/pkg/config.Version=$(VERSION)" IMAGE_REPO=nspccdev/neo-go From 111d7eecdded0e6613ef58f6ed8e637293a9a80e Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 1 Apr 2020 18:33:32 +0300 Subject: [PATCH 2/2] Makefile: quote config.Version Accept strings with spaces. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b0077b4e8..5edcc1484 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ DC_FILE=.docker/docker-compose.yml REPO ?= "$(shell go list -m)" VERSION ?= "$(shell git describe --tags 2>/dev/null | sed 's/^v//')" -BUILD_FLAGS = "-X $(REPO)/pkg/config.Version=$(VERSION)" +BUILD_FLAGS = "-X '$(REPO)/pkg/config.Version=$(VERSION)'" IMAGE_REPO=nspccdev/neo-go