mirror of
https://github.com/nspcc-dev/neo-go.git
synced 2024-12-23 03:41:34 +00:00
Merge pull request #2684 from nspcc-dev/build-fix
Tiny build corrections
This commit is contained in:
commit
6a5a8c5e89
3 changed files with 4 additions and 4 deletions
2
Makefile
2
Makefile
|
@ -16,7 +16,7 @@ DC_FILE ?= ".docker/docker-compose.yml" # Single docker-compose for Ubuntu/WSC,
|
|||
ENV_IMAGE_TAG="env_neo_go_image"
|
||||
|
||||
REPO ?= "$(shell go list -m)"
|
||||
VERSION ?= "$(shell git describe --tags --match "v*" 2>/dev/null | sed 's/^v//')"
|
||||
VERSION ?= "$(shell git describe --tags --match "v*" --abbrev=8 2>/dev/null | sed 's/^v//')"
|
||||
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)'"
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ NeoGo, `:latest` points to the latest release) or build yourself.
|
|||
|
||||
### Building
|
||||
|
||||
To build NeoGo you need Go 1.16+ and `make`:
|
||||
To build NeoGo you need Go 1.17+ and `make`:
|
||||
|
||||
```
|
||||
make build
|
||||
|
|
|
@ -214,7 +214,7 @@ func TestLoad(t *testing.T) {
|
|||
require.NoError(t, os.WriteFile(filenameErr, []byte(src+"invalid_token"), os.ModePerm))
|
||||
filenameErr = "'" + filenameErr + "'"
|
||||
goMod := []byte(`module test.example/vmcli
|
||||
go 1.16`)
|
||||
go 1.17`)
|
||||
require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "go.mod"), goMod, os.ModePerm))
|
||||
|
||||
e := newTestVMCLI(t)
|
||||
|
@ -252,7 +252,7 @@ require (
|
|||
github.com/nspcc-dev/neo-go/pkg/interop v0.0.0
|
||||
)
|
||||
replace github.com/nspcc-dev/neo-go/pkg/interop => ` + filepath.Join(wd, "../../interop") + `
|
||||
go 1.16`)
|
||||
go 1.17`)
|
||||
require.NoError(t, os.WriteFile(filepath.Join(tmpDir, "go.mod"), goMod, os.ModePerm))
|
||||
|
||||
e := newTestVMCLI(t)
|
||||
|
|
Loading…
Reference in a new issue