From bb4385ca50734143b94b210d699f8935ea088be1 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Thu, 6 Aug 2020 16:28:41 +0300 Subject: [PATCH 1/2] drop support for Go 1.12 It's old and not maintained. Use latest Go for builds and test only with 1.13 and 1.14. --- .circleci/config.yml | 23 ++--------------------- .travis.yml | 2 +- README.md | 2 +- go.mod | 2 +- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e4dfc57ae..500c30557 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,11 +3,6 @@ orbs: codecov: codecov/codecov@1.0.5 executors: - go1_12: - docker: - - image: circleci/golang:1.12 - environment: - GO111MODULE: "on" go1_13: docker: - image: circleci/golang:1.13 @@ -54,16 +49,6 @@ jobs: name: go-vet command: go vet ./... - test_1_12: - working_directory: /go/src/github.com/nspcc-dev/neo-go - executor: go1_12 - steps: - - checkout - - run: git submodule sync - - run: git submodule update --init - - gomod - - run: go test -v -race ./... - test_1_13: working_directory: /go/src/github.com/nspcc-dev/neo-go executor: go1_13 @@ -88,7 +73,7 @@ jobs: build_cli: working_directory: /go/src/github.com/nspcc-dev/neo-go - executor: go1_12 + executor: go1_14 steps: - checkout - gomod @@ -99,7 +84,7 @@ jobs: build_image: working_directory: /go/src/github.com/nspcc-dev/neo-go - executor: go1_12 + executor: go1_14 docker: - image: golang:1-alpine steps: @@ -130,10 +115,6 @@ workflows: filters: tags: only: v/[0-9]+\.[0-9]+\.[0-9]+/ - - test_1_12: - filters: - tags: - only: v/[0-9]+\.[0-9]+\.[0-9]+/ - test_1_13: filters: tags: diff --git a/.travis.yml b/.travis.yml index 86671839c..619ac925a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go go: - - 1.12.x + - 1.14.x env: - GO111MODULE=on install: diff --git a/README.md b/README.md index 924d097be..ae6c7cc6d 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ branch and only contain Neo 2 code. ## Installation -Go: 1.12+ +Go: 1.13+ Install dependencies. diff --git a/go.mod b/go.mod index 696d28e6a..8d9a4b472 100644 --- a/go.mod +++ b/go.mod @@ -26,4 +26,4 @@ require ( gopkg.in/abiosoft/ishell.v2 v2.0.0 ) -go 1.12 +go 1.13 From 010d55e92f5cf05786d150c2ad062ab94b51d2c2 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Thu, 6 Aug 2020 16:32:36 +0300 Subject: [PATCH 2/2] use -trimpath build flag for more reproducible builds Fix #349. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 597e5f650..3c97c4d6e 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ build: deps @set -x \ && export GOGC=off \ && export CGO_ENABLED=0 \ - && go build -v -mod=vendor -ldflags $(BUILD_FLAGS) -o ${BINARY} ./cli/main.go + && go build -trimpath -v -mod=vendor -ldflags $(BUILD_FLAGS) -o ${BINARY} ./cli/main.go neo-go.service: neo-go.service.template @sed -r -e 's_BINDIR_$(BINDIR)_' -e 's_UNITWORKDIR_$(UNITWORKDIR)_' -e 's_SYSCONFIGDIR_$(SYSCONFIGDIR)_' $< >$@