Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: bump kubo v0.14 #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
strategy:
matrix:
golang:
- 1.16.x
- 1.17.x
- 1.18.x
#- tip
steps:
- name: Checkout
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
golang: ['1.17.x']
golang: ['1.17.x', '1.18.x']
steps:
- name: Checkout
uses: actions/[email protected]
Expand All @@ -56,7 +56,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
golang: ['1.17.x']
golang: ['1.17.x', '1.18.x']
steps:
- name: Checkout
uses: actions/[email protected]
Expand All @@ -70,4 +70,4 @@ jobs:
git --no-pager diff go.mod go.sum
git --no-pager diff --quiet go.mod go.sum
- name: Run tests
run: go test ./... -count=5
run: go test ./... -count=5
2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/json"

"github.com/ipfs/go-datastore"
config "github.com/ipfs/go-ipfs-config"
config "github.com/ipfs/kubo/config"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions fsrepo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"path/filepath"
"testing"

"github.com/ipfs/go-ipfs/thirdparty/assert"
"github.com/ipfs/kubo/thirdparty/assert"
"github.com/stretchr/testify/require"

datastore "github.com/ipfs/go-datastore"
config "github.com/ipfs/go-ipfs-config"
config "github.com/ipfs/kubo/config"
)

// tests ported from fsrepo
Expand Down
9 changes: 4 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ go 1.16
require (
github.com/ipfs/go-datastore v0.5.1
github.com/ipfs/go-ds-sql v0.3.0
github.com/ipfs/go-filestore v1.1.0
github.com/ipfs/go-ipfs v0.11.0
github.com/ipfs/go-ipfs-config v0.19.0
github.com/ipfs/go-filestore v1.2.0
github.com/ipfs/go-ipfs-keystore v0.0.2
github.com/libp2p/go-libp2p-core v0.13.0
github.com/ipfs/kubo v0.14.0
github.com/libp2p/go-libp2p-core v0.16.1
github.com/multiformats/go-multiaddr v0.5.0
github.com/mutecomm/go-sqlcipher/v4 v4.4.2
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.7.1
)
404 changes: 322 additions & 82 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion init.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

sync_ds "github.com/ipfs/go-datastore/sync"
config "github.com/ipfs/go-ipfs-config"
config "github.com/ipfs/kubo/config"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion open.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/ipfs/go-datastore"
sync_ds "github.com/ipfs/go-datastore/sync"
"github.com/ipfs/go-ipfs/repo"
"github.com/ipfs/kubo/repo"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/ipfs/go-datastore"
"github.com/ipfs/go-filestore"
config "github.com/ipfs/go-ipfs-config"
config "github.com/ipfs/kubo/config"
keystore "github.com/ipfs/go-ipfs-keystore"
"github.com/ipfs/go-ipfs/repo"
"github.com/ipfs/go-ipfs/repo/common"
"github.com/ipfs/kubo/repo"
"github.com/ipfs/kubo/repo/common"
ma "github.com/multiformats/go-multiaddr"
"github.com/pkg/errors"
)
Expand Down
2 changes: 1 addition & 1 deletion repo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/ipfs/go-datastore"
config "github.com/ipfs/go-ipfs-config"
config "github.com/ipfs/kubo/config"
ma "github.com/multiformats/go-multiaddr"
"github.com/stretchr/testify/require"
)
Expand Down