From ed667f7e54a4a5061849098befd21c792e7263dd Mon Sep 17 00:00:00 2001 From: Svarog Date: Wed, 30 Mar 2022 20:17:29 +0300 Subject: [PATCH] Upgrade to go 1.18 (#1992) * Upgrade to go 1.18 * Fix stability-test shell script --- .github/workflows/deploy.yaml | 2 +- .github/workflows/race.yaml | 2 +- .github/workflows/tests.yaml | 6 +++--- README.md | 2 +- build_and_test.sh | 5 ++--- cmd/kaspactl/README.md | 2 +- cmd/kaspactl/docker/Dockerfile | 2 +- cmd/kaspaminer/README.md | 2 +- cmd/kaspaminer/docker/Dockerfile | 2 +- docker/Dockerfile | 2 +- go.mod | 13 +++++++++---- go.sum | 2 -- stability-tests/docker/Dockerfile | 2 +- stability-tests/install_and_test.sh | 4 ++-- 14 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ac00972bf..9e470b29e 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -28,7 +28,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 - name: Build on Linux if: runner.os == 'Linux' diff --git a/.github/workflows/race.yaml b/.github/workflows/race.yaml index 27847217e..b04280867 100644 --- a/.github/workflows/race.yaml +++ b/.github/workflows/race.yaml @@ -22,7 +22,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 - name: Set scheduled branch name shell: bash diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index be25de29a..d38178550 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -33,7 +33,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 # Source: https://github.com/actions/cache/blob/main/examples.md#go---modules @@ -58,7 +58,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 - name: Checkout uses: actions/checkout@v2 @@ -86,7 +86,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 - name: Delete the stability tests from coverage run: rm -r stability-tests diff --git a/README.md b/README.md index 6b725a525..64e55ddf7 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Kaspa is an attempt at a proof-of-work cryptocurrency with instant confirmations ## Requirements -Go 1.16 or later. +Go 1.18 or later. ## Installation diff --git a/build_and_test.sh b/build_and_test.sh index 886eddab6..76cb28049 100755 --- a/build_and_test.sh +++ b/build_and_test.sh @@ -5,9 +5,8 @@ FLAGS=$@ go version go get $FLAGS -t -d ./... -# This is to bypass a go bug: https://github.com/golang/go/issues/27643 -GO111MODULE=off go get $FLAGS golang.org/x/lint/golint \ - honnef.co/go/tools/cmd/staticcheck +GO111MODULE=off go get $FLAGS golang.org/x/lint/golint +go install $FLAGS honnef.co/go/tools/cmd/staticcheck@latest test -z "$(go fmt ./...)" diff --git a/cmd/kaspactl/README.md b/cmd/kaspactl/README.md index cf0fcf7b5..0af8a84d3 100644 --- a/cmd/kaspactl/README.md +++ b/cmd/kaspactl/README.md @@ -4,7 +4,7 @@ kaspactl is an RPC client for kaspad ## Requirements -Go 1.16 or later. +Go 1.18 or later. ## Installation diff --git a/cmd/kaspactl/docker/Dockerfile b/cmd/kaspactl/docker/Dockerfile index ada893150..433ff2954 100644 --- a/cmd/kaspactl/docker/Dockerfile +++ b/cmd/kaspactl/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.16-alpine AS build +FROM golang:1.18-alpine AS build RUN mkdir -p /go/src/github.com/kaspanet/kaspad diff --git a/cmd/kaspaminer/README.md b/cmd/kaspaminer/README.md index 26bdfa61f..71114a239 100644 --- a/cmd/kaspaminer/README.md +++ b/cmd/kaspaminer/README.md @@ -4,7 +4,7 @@ Kaspaminer is a CPU-based miner for kaspad ## Requirements -Go 1.16 or later. +Go 1.18 or later. ## Installation diff --git a/cmd/kaspaminer/docker/Dockerfile b/cmd/kaspaminer/docker/Dockerfile index 63356a7e6..ad9d5098c 100644 --- a/cmd/kaspaminer/docker/Dockerfile +++ b/cmd/kaspaminer/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.16-alpine AS build +FROM golang:1.18-alpine AS build RUN mkdir -p /go/src/github.com/kaspanet/kaspad diff --git a/docker/Dockerfile b/docker/Dockerfile index a503009d3..bafc84059 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.16-alpine AS build +FROM golang:1.18-alpine AS build RUN mkdir -p /go/src/github.com/kaspanet/kaspad diff --git a/go.mod b/go.mod index 70caf33c2..c591fc283 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kaspanet/kaspad -go 1.16 +go 1.18 require ( github.com/btcsuite/btcutil v1.0.2 @@ -16,11 +16,16 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d github.com/tyler-smith/go-bip39 v1.1.0 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a - golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea // indirect golang.org/x/term v0.0.0-20210503060354-a79de5458b56 - google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect google.golang.org/grpc v1.38.0 - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 // indirect google.golang.org/protobuf v1.26.0 +) + +require ( + github.com/golang/snappy v0.0.1 // indirect + golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect + golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea // indirect + golang.org/x/text v0.3.5 // indirect + google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect ) diff --git a/go.sum b/go.sum index 794a8b21d..29d055384 100644 --- a/go.sum +++ b/go.sum @@ -151,8 +151,6 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.38.0 h1:/9BgsAsa5nWe26HqOlvlgJnqBuktYOLCgjCPqsa56W0= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/stability-tests/docker/Dockerfile b/stability-tests/docker/Dockerfile index f67f2926a..051d985b2 100644 --- a/stability-tests/docker/Dockerfile +++ b/stability-tests/docker/Dockerfile @@ -4,7 +4,7 @@ ARG KASPAMINER_IMAGE FROM ${KASPAD_IMAGE} as kaspad FROM ${KASPAMINER_IMAGE} as kaspaminer -FROM golang:1.16-alpine +FROM golang:1.18-alpine RUN mkdir -p /go/src/github.com/kaspanet/kaspad diff --git a/stability-tests/install_and_test.sh b/stability-tests/install_and_test.sh index 934ac51b7..57a1cc64d 100755 --- a/stability-tests/install_and_test.sh +++ b/stability-tests/install_and_test.sh @@ -5,8 +5,8 @@ FLAGS=$@ go version go get $FLAGS -t -d ../... -# This is to bypass a go bug: https://github.com/golang/go/issues/27643 -GO111MODULE=off go get $FLAGS honnef.co/go/tools/cmd/staticcheck +GO111MODULE=off go get $FLAGS golang.org/x/lint/golint +go install $FLAGS honnef.co/go/tools/cmd/staticcheck@latest test -z "$(go fmt ./...)"