Skip to content

Commit bca561a

Browse files
committed
Fix makefile and previous migration to actually be able to run tests
1 parent a80e818 commit bca561a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ clean.%: MIGRATION=$*
3535
clean.%:
3636
make -C $(MIGRATION) clean
3737

38-
test_go: $(shell ls -d fs-repo-*-to-*/migration | sed -e 's/fs-repo/test_go.fs-repo/')
38+
test_go: $(shell ls -d fs-repo-*-to-* | sed -e 's/fs-repo/test_go.fs-repo/')
3939
@echo OK
4040

4141
test_go.%: MIGRATION=$*
4242
test_go.%:
43-
@cd $(MIGRATION) && go test -mod=vendor
43+
@cd $(MIGRATION)/migration && go test -mod=vendor

fs-repo-10-to-11/migration/migration.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import (
1111
"github.com/ipfs/go-blockservice"
1212
"github.com/ipfs/go-datastore"
1313
"github.com/ipfs/go-filestore"
14-
"github.com/ipfs/go-ipfs-blockstore"
15-
"github.com/ipfs/go-ipfs-exchange-offline"
14+
blockstore "github.com/ipfs/go-ipfs-blockstore"
15+
offline "github.com/ipfs/go-ipfs-exchange-offline"
1616
"github.com/ipfs/go-ipfs-pinner/pinconv"
1717
"github.com/ipfs/go-ipfs/plugin/loader"
1818
"github.com/ipfs/go-ipfs/repo"
1919
"github.com/ipfs/go-ipfs/repo/fsrepo"
2020
"github.com/ipfs/go-ipfs/repo/fsrepo/migrations"
21-
"github.com/ipfs/go-ipld-format"
21+
format "github.com/ipfs/go-ipld-format"
2222
"github.com/ipfs/go-merkledag"
2323

2424
migrate "github.com/ipfs/fs-repo-migrations/tools/go-migrate"
@@ -88,7 +88,7 @@ func (m Migration) Apply(opts migrate.Options) error {
8888

8989
err = migrations.WriteRepoVersion(opts.Path, toVer)
9090
if err != nil {
91-
return fmt.Errorf("failed to update version file to %s: %v", toVer, err)
91+
return fmt.Errorf("failed to update version file to %d: %v", toVer, err)
9292
}
9393

9494
log.Print("updated version file")

0 commit comments

Comments
 (0)