forked from TrueCloudLab/neoneo-go
Merge pull request #2390 from nspcc-dev/support-windows
Revert "Makefile: add `unsupported` to docker windows image tag and b…
This commit is contained in:
commit
623fdee97c
1 changed files with 1 additions and 2 deletions
3
Makefile
3
Makefile
|
@ -10,9 +10,8 @@ UNITWORKDIR = "/var/lib/neo-go"
|
||||||
|
|
||||||
DC_FILE=.docker/docker-compose.yml
|
DC_FILE=.docker/docker-compose.yml
|
||||||
|
|
||||||
GOOS ?= $(shell go env GOOS)
|
|
||||||
REPO ?= "$(shell go list -m)"
|
REPO ?= "$(shell go list -m)"
|
||||||
VERSION ?= "$(shell git describe --tags 2>/dev/null | sed 's/^v//')$(shell if [ "$(GOOS)" = "windows" ]; then echo "_unsupported"; fi)"
|
VERSION ?= "$(shell git describe --tags 2>/dev/null | sed 's/^v//')"
|
||||||
MODVERSION ?= "$(shell cat go.mod | cat go.mod | sed -r -n -e 's|.*pkg/interop (.*)|\1|p')"
|
MODVERSION ?= "$(shell cat go.mod | cat go.mod | sed -r -n -e 's|.*pkg/interop (.*)|\1|p')"
|
||||||
BUILD_FLAGS = "-X '$(REPO)/pkg/config.Version=$(VERSION)' -X '$(REPO)/cli/smartcontract.ModVersion=$(MODVERSION)'"
|
BUILD_FLAGS = "-X '$(REPO)/pkg/config.Version=$(VERSION)' -X '$(REPO)/cli/smartcontract.ModVersion=$(MODVERSION)'"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue