Skip to content

Commit 0bc4bf1

Browse files
authored
chore(go-version): upgrade from Go 1.15 to Go 1.17 (#1933)
1 parent 506565d commit 0bc4bf1

File tree

10 files changed

+161
-28
lines changed

10 files changed

+161
-28
lines changed

.github/workflows/build.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
builds:
99
strategy:
1010
matrix:
11-
go-version: [1.15.x]
11+
go-version: [1.17.x]
1212
platform: [macos-latest, ubuntu-latest]
1313
runs-on: ${{ matrix.platform }}
1414
steps:
@@ -36,10 +36,10 @@ jobs:
3636
path: ${{ steps.go-cache-paths.outputs.go-mod }}
3737
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
3838
restore-keys: ${{ runner.os }}-go-mod
39-
39+
4040
- name: Run build
4141
run: make build
42-
42+
4343
publish-code-coverage:
4444
runs-on: ubuntu-latest
4545
steps:
@@ -88,27 +88,22 @@ jobs:
8888
docker-build-n-push:
8989
runs-on: ubuntu-latest
9090
steps:
91-
-
92-
name: Set up QEMU
91+
- name: Set up QEMU
9392
uses: docker/setup-qemu-action@v1
94-
-
95-
name: Set up Docker Buildx
93+
- name: Set up Docker Buildx
9694
uses: docker/setup-buildx-action@v1
97-
-
98-
name: Login to DockerHub
95+
- name: Login to DockerHub
9996
uses: docker/login-action@v1
10097
with:
10198
username: ${{ secrets.DOCKERHUB_USERNAME }}
10299
password: ${{ secrets.DOCKERHUB_TOKEN }}
103-
-
104-
name: Build and push
100+
- name: Build and push
105101
id: docker_build
106102
uses: docker/build-push-action@v2
107103
with:
108104
file: ./Dockerfile
109105
platforms: linux/amd64
110106
push: true
111107
tags: chainsafe/gossamer:latest
112-
-
113-
name: Image digest
114-
run: echo ${{ steps.docker_build.outputs.digest }}
108+
- name: Image digest
109+
run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/setup-go@v2
2525
with:
26-
go-version: "1.15.x"
26+
go-version: "1.17.x"
2727
- uses: actions/checkout@v2
2828

2929
- name: Run go vet

.github/workflows/code-cov.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
publish-code-coverage:
88
strategy:
99
matrix:
10-
go-version: [1.15.x]
10+
go-version: [1.17.x]
1111
runs-on: ubuntu-latest
1212
steps:
1313
- id: go-cache-paths
@@ -48,8 +48,8 @@ jobs:
4848
- uses: codecov/[email protected]
4949
with:
5050
if_ci_failed: success
51-
informational: true
51+
informational: true
5252
files: ./coverage.out
5353
flags: unit-tests
5454
name: coverage
55-
verbose: true
55+
verbose: true

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jobs:
77
unit-tests:
88
strategy:
99
matrix:
10-
go-version: [1.15.x]
10+
go-version: [1.17.x]
1111
platform: [ubuntu-latest]
1212
runs-on: ${{ matrix.platform }}
1313
steps:
1414
- id: go-cache-paths
1515
run: |
1616
echo "::set-output name=go-build::$(go env GOCACHE)"
1717
echo "::set-output name=go-mod::$(go env GOMODCACHE)"
18-
18+
1919
- uses: actions/setup-go@v2
2020
with:
2121
go-version: ${{ matrix.go-version }}
@@ -60,4 +60,4 @@ jobs:
6060
run: make test-state-race
6161

6262
- name: Run build
63-
run: make build
63+
run: make build

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG DEBIAN_VERSION=bullseye-slim
2-
ARG GO_VERSION=1.15-buster
2+
ARG GO_VERSION=1.17-buster
33

44
FROM golang:${GO_VERSION} AS builder
55

Dockerfile.staging

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16
1+
FROM golang:1.17
22

33
ARG chain="polkadot"
44
ARG basepath="~/.gossamer"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ For more information about Gossamer, the Polkadot ecosystem, and how to use Goss
4343

4444
### Prerequisites
4545

46-
install go version `>=1.15`
46+
install go version `>=1.16`
4747

4848
### Installation
4949

docs/docs/getting-started/installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permalink: /getting-started/installation
88

99
## Prerequisites
1010

11-
Install <a target="_blank" rel="noopener noreferrer" href="https://golang.org/">Go</a> version `>=1.15`
11+
Install <a target="_blank" rel="noopener noreferrer" href="https://golang.org/">Go</a> version `>=1.16`
1212

1313
## Installation
1414

go.mod

Lines changed: 136 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ require (
2525
github.com/holiman/bloomfilter/v2 v2.0.3
2626
github.com/ipfs/go-ds-badger2 v0.1.1
2727
github.com/ipfs/go-ipns v0.1.2 //indirect
28-
github.com/jcelliott/lumber v0.0.0-20160324203708-dd349441af25 // indirect
2928
github.com/jpillora/ipfilter v1.2.2
3029
github.com/libp2p/go-libp2p v0.15.1
3130
github.com/libp2p/go-libp2p-core v0.9.0
@@ -45,4 +44,139 @@ require (
4544
google.golang.org/protobuf v1.27.1
4645
)
4746

48-
go 1.16
47+
require (
48+
github.com/DataDog/zstd v1.4.1 // indirect
49+
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
50+
github.com/beorn7/perks v1.0.1 // indirect
51+
github.com/btcsuite/btcd v0.22.0-beta // indirect
52+
github.com/cespare/xxhash v1.1.0 // indirect
53+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
54+
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
55+
github.com/davecgh/go-spew v1.1.1 // indirect
56+
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
57+
github.com/deckarep/golang-set v1.7.1 // indirect
58+
github.com/decred/base58 v1.0.3 // indirect
59+
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
60+
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
61+
github.com/dustin/go-humanize v1.0.0 // indirect
62+
github.com/flynn/noise v1.0.0 // indirect
63+
github.com/go-interpreter/wagon v0.6.0 // indirect
64+
github.com/go-ole/go-ole v1.2.1 // indirect
65+
github.com/go-playground/locales v0.13.0 // indirect
66+
github.com/go-playground/universal-translator v0.17.0 // indirect
67+
github.com/go-stack/stack v1.8.0 // indirect
68+
github.com/gogo/protobuf v1.3.2 // indirect
69+
github.com/golang/snappy v0.0.4 // indirect
70+
github.com/google/gopacket v1.1.19 // indirect
71+
github.com/gtank/ristretto255 v0.1.2 // indirect
72+
github.com/hashicorp/errwrap v1.0.0 // indirect
73+
github.com/hashicorp/go-multierror v1.1.0 // indirect
74+
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
75+
github.com/huin/goupnp v1.0.2 // indirect
76+
github.com/ipfs/go-cid v0.0.7 // indirect
77+
github.com/ipfs/go-datastore v0.4.6 // indirect
78+
github.com/ipfs/go-ipfs-util v0.0.2 // indirect
79+
github.com/ipfs/go-log v1.0.5 // indirect
80+
github.com/ipfs/go-log/v2 v2.3.0 // indirect
81+
github.com/ipld/go-ipld-prime v0.9.0 // indirect
82+
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
83+
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
84+
github.com/jbenet/goprocess v0.1.4 // indirect
85+
github.com/jcelliott/lumber v0.0.0-20160324203708-dd349441af25 // indirect
86+
github.com/jpillora/backoff v1.0.0 // indirect
87+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
88+
github.com/koron/go-ssdp v0.0.2 // indirect
89+
github.com/leodido/go-urn v1.2.0 // indirect
90+
github.com/libp2p/go-addr-util v0.1.0 // indirect
91+
github.com/libp2p/go-buffer-pool v0.0.2 // indirect
92+
github.com/libp2p/go-cidranger v1.1.0 // indirect
93+
github.com/libp2p/go-conn-security-multistream v0.2.1 // indirect
94+
github.com/libp2p/go-eventbus v0.2.1 // indirect
95+
github.com/libp2p/go-flow-metrics v0.0.3 // indirect
96+
github.com/libp2p/go-libp2p-asn-util v0.0.0-20200825225859-85005c6cf052 // indirect
97+
github.com/libp2p/go-libp2p-autonat v0.4.2 // indirect
98+
github.com/libp2p/go-libp2p-blankhost v0.2.0 // indirect
99+
github.com/libp2p/go-libp2p-circuit v0.4.0 // indirect
100+
github.com/libp2p/go-libp2p-kbucket v0.4.7 // indirect
101+
github.com/libp2p/go-libp2p-mplex v0.4.1 // indirect
102+
github.com/libp2p/go-libp2p-nat v0.0.6 // indirect
103+
github.com/libp2p/go-libp2p-noise v0.2.2 // indirect
104+
github.com/libp2p/go-libp2p-pnet v0.2.0 // indirect
105+
github.com/libp2p/go-libp2p-record v0.1.3 // indirect
106+
github.com/libp2p/go-libp2p-routing-helpers v0.2.3 // indirect
107+
github.com/libp2p/go-libp2p-swarm v0.5.3 // indirect
108+
github.com/libp2p/go-libp2p-tls v0.2.0 // indirect
109+
github.com/libp2p/go-libp2p-transport-upgrader v0.4.6 // indirect
110+
github.com/libp2p/go-libp2p-yamux v0.5.4 // indirect
111+
github.com/libp2p/go-maddr-filter v0.1.0 // indirect
112+
github.com/libp2p/go-mplex v0.3.0 // indirect
113+
github.com/libp2p/go-msgio v0.0.6 // indirect
114+
github.com/libp2p/go-nat v0.0.5 // indirect
115+
github.com/libp2p/go-netroute v0.1.6 // indirect
116+
github.com/libp2p/go-openssl v0.0.7 // indirect
117+
github.com/libp2p/go-reuseport v0.0.2 // indirect
118+
github.com/libp2p/go-reuseport-transport v0.0.5 // indirect
119+
github.com/libp2p/go-sockaddr v0.1.1 // indirect
120+
github.com/libp2p/go-stream-muxer-multistream v0.3.0 // indirect
121+
github.com/libp2p/go-tcp-transport v0.2.8 // indirect
122+
github.com/libp2p/go-ws-transport v0.5.0 // indirect
123+
github.com/libp2p/go-yamux/v2 v2.2.0 // indirect
124+
github.com/libp2p/zeroconf/v2 v2.1.0 // indirect
125+
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
126+
github.com/mattn/go-colorable v0.1.8 // indirect
127+
github.com/mattn/go-isatty v0.0.13 // indirect
128+
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
129+
github.com/miekg/dns v1.1.43 // indirect
130+
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
131+
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
132+
github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
133+
github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
134+
github.com/minio/sha256-simd v1.0.0 // indirect
135+
github.com/mr-tron/base58 v1.2.0 // indirect
136+
github.com/multiformats/go-base32 v0.0.3 // indirect
137+
github.com/multiformats/go-base36 v0.1.0 // indirect
138+
github.com/multiformats/go-multiaddr-dns v0.3.1 // indirect
139+
github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
140+
github.com/multiformats/go-multibase v0.0.3 // indirect
141+
github.com/multiformats/go-multicodec v0.2.0 // indirect
142+
github.com/multiformats/go-multihash v0.0.15 // indirect
143+
github.com/multiformats/go-multistream v0.2.2 // indirect
144+
github.com/multiformats/go-varint v0.0.6 // indirect
145+
github.com/naoina/go-stringutil v0.1.0 // indirect
146+
github.com/opentracing/opentracing-go v1.2.0 // indirect
147+
github.com/phuslu/iploc v1.0.20200807 // indirect
148+
github.com/pierrec/xxHash v0.1.5 // indirect
149+
github.com/pkg/errors v0.9.1 // indirect
150+
github.com/pmezard/go-difflib v1.0.0 // indirect
151+
github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1 // indirect
152+
github.com/prometheus/client_golang v1.11.0 // indirect
153+
github.com/prometheus/client_model v0.2.0 // indirect
154+
github.com/prometheus/common v0.30.0 // indirect
155+
github.com/prometheus/procfs v0.7.3 // indirect
156+
github.com/rs/cors v1.7.0 // indirect
157+
github.com/russross/blackfriday/v2 v2.0.1 // indirect
158+
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
159+
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
160+
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
161+
github.com/stretchr/objx v0.1.1 // indirect
162+
github.com/tklauser/go-sysconf v0.3.5 // indirect
163+
github.com/tklauser/numcpus v0.2.2 // indirect
164+
github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect
165+
github.com/vedhavyas/go-subkey v1.0.2 // indirect
166+
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
167+
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
168+
github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9 // indirect
169+
github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 // indirect
170+
go.opencensus.io v0.23.0 // indirect
171+
go.uber.org/atomic v1.9.0 // indirect
172+
go.uber.org/multierr v1.7.0 // indirect
173+
go.uber.org/zap v1.19.0 // indirect
174+
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
175+
golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 // indirect
176+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
177+
google.golang.org/appengine v1.6.6 // indirect
178+
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
179+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
180+
)
181+
182+
go 1.17

go.sum

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
395395
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
396396
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
397397
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
398+
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
398399
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
399400
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
400401
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
@@ -1334,8 +1335,9 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
13341335
go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
13351336
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
13361337
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1337-
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
13381338
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
1339+
go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
1340+
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
13391341
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
13401342
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
13411343
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -1483,6 +1485,7 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R
14831485
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
14841486
golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
14851487
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
1488+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
14861489
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
14871490
golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
14881491
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -1785,6 +1788,7 @@ google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
17851788
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
17861789
google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
17871790
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
1791+
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
17881792
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
17891793
google.golang.org/grpc v1.40.0 h1:AGJ0Ih4mHjSeibYkFGh1dD9KJ/eOtZ93I6hoHhukQ5Q=
17901794
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=

0 commit comments

Comments
 (0)