Skip to content

Commit 196887c

Browse files
committed
chore: bump go-libp2p v0.22.0 & go1.18&go1.19
Fixes: #9225
1 parent 82fbb84 commit 196887c

File tree

106 files changed

+1330
-1641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+1330
-1641
lines changed

.circleci/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ default_environment: &default_environment
3737
executors:
3838
golang:
3939
docker:
40-
- image: cimg/go:1.18.5
40+
- image: cimg/go:1.19.1
4141
working_directory: ~/ipfs/kubo
4242
environment:
4343
<<: *default_environment
@@ -62,7 +62,7 @@ executors:
6262
E2E_IPFSD_TYPE: go
6363
dockerizer:
6464
docker:
65-
- image: cimg/go:1.18.5
65+
- image: cimg/go:1.19.1
6666
environment:
6767
IMAGE_NAME: ipfs/kubo
6868
WIP_IMAGE_TAG: wip
@@ -156,8 +156,8 @@ jobs:
156156
- run: sudo apt update
157157
- run: |
158158
mkdir ~/localgo && cd ~/localgo
159-
wget https://golang.org/dl/go1.18.5.linux-amd64.tar.gz
160-
tar xfz go1.18.5.linux-amd64.tar.gz
159+
wget https://golang.org/dl/go1.19.1.linux-amd64.tar.gz
160+
tar xfz go1.19.1.linux-amd64.tar.gz
161161
echo "export PATH=$(pwd)/go/bin:\$PATH" >> ~/.bashrc
162162
- run: go version
163163
- run: sudo apt install socat net-tools
@@ -223,7 +223,7 @@ jobs:
223223
- *store_gomod
224224
interop:
225225
docker:
226-
- image: cimg/go:1.18.5-node
226+
- image: cimg/go:1.19.1-node
227227
parallelism: 4
228228
resource_class: large
229229
steps:

.github/workflows/golang-analysis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
submodules: recursive
1212
- uses: actions/setup-go@v2
1313
with:
14-
go-version: "1.18.x"
14+
go-version: "1.19.x"
1515
- name: Check that go.mod is tidy
1616
uses: protocol/[email protected]
1717
with:
@@ -22,12 +22,13 @@ jobs:
2222
exit 1
2323
fi
2424
git diff --exit-code -- go.sum go.mod
25-
- name: gofmt
25+
- name: go fmt
2626
if: always() # run this step even if the previous one failed
2727
run: |
28-
out=$(gofmt -s -l .)
28+
out=$(go fmt ./...)
2929
if [[ -n "$out" ]]; then
30-
echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
30+
echo "Files are not go-fmt-ed:"
31+
echo "$out"
3132
exit 1
3233
fi
3334
- name: go vet

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Note: when updating the go minor version here, also update the go-channel in snap/snapcraft.yml
2-
FROM golang:1.18.5-buster
2+
FROM golang:1.19.1-buster
33
LABEL maintainer="Steven Allen <[email protected]>"
44

55
# Install deps
@@ -114,7 +114,7 @@ ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/start_ipfs"]
114114
# Heathcheck for the container
115115
# QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn is the CID of empty folder
116116
HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
117-
CMD ipfs dag stat /ipfs/QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn || exit 1
117+
CMD ipfs dag stat /ipfs/QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn || exit 1
118118

119119
# Execute the daemon subcommand by default
120120
CMD ["daemon", "--migrate=true", "--agent-version-suffix=docker"]

cmd/ipfs/add_migrations.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/ipfs/kubo/core/coreapi"
1717
"github.com/ipfs/kubo/repo/fsrepo/migrations"
1818
"github.com/ipfs/kubo/repo/fsrepo/migrations/ipfsfetcher"
19-
"github.com/libp2p/go-libp2p-core/peer"
19+
"github.com/libp2p/go-libp2p/core/peer"
2020
)
2121

2222
// addMigrations adds any migration downloaded by the fetcher to the IPFS node

cmd/ipfs/pinmfs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66
"time"
77

8-
"github.com/libp2p/go-libp2p-core/host"
9-
peer "github.com/libp2p/go-libp2p-core/peer"
8+
"github.com/libp2p/go-libp2p/core/host"
9+
peer "github.com/libp2p/go-libp2p/core/peer"
1010

1111
cid "github.com/ipfs/go-cid"
1212
ipld "github.com/ipfs/go-ipld-format"

cmd/ipfs/pinmfs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
ipld "github.com/ipfs/go-ipld-format"
1111
merkledag "github.com/ipfs/go-merkledag"
1212
config "github.com/ipfs/kubo/config"
13-
"github.com/libp2p/go-libp2p-core/host"
14-
peer "github.com/libp2p/go-libp2p-core/peer"
13+
"github.com/libp2p/go-libp2p/core/host"
14+
peer "github.com/libp2p/go-libp2p/core/peer"
1515
)
1616

1717
type testPinMFSContext struct {

config/bootstrap_peers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"fmt"
66

7-
peer "github.com/libp2p/go-libp2p-core/peer"
7+
peer "github.com/libp2p/go-libp2p/core/peer"
88
ma "github.com/multiformats/go-multiaddr"
99
)
1010

config/identity.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package config
33
import (
44
"encoding/base64"
55

6-
ic "github.com/libp2p/go-libp2p-core/crypto"
6+
ic "github.com/libp2p/go-libp2p/core/crypto"
77
)
88

99
const IdentityTag = "Identity"

config/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"time"
99

1010
"github.com/ipfs/interface-go-ipfs-core/options"
11-
"github.com/libp2p/go-libp2p-core/crypto"
12-
"github.com/libp2p/go-libp2p-core/peer"
11+
"github.com/libp2p/go-libp2p/core/crypto"
12+
"github.com/libp2p/go-libp2p/core/peer"
1313
)
1414

1515
func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {

config/init_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
"github.com/ipfs/interface-go-ipfs-core/options"
8-
crypto_pb "github.com/libp2p/go-libp2p-core/crypto/pb"
8+
crypto_pb "github.com/libp2p/go-libp2p/core/crypto/pb"
99
)
1010

1111
func TestCreateIdentity(t *testing.T) {

0 commit comments

Comments
 (0)