diff --git a/Makefile b/Makefile index 58b86415..cd22d303 100644 --- a/Makefile +++ b/Makefile @@ -35,9 +35,9 @@ clean.%: MIGRATION=$* clean.%: make -C $(MIGRATION) clean -test_go: $(shell ls -d fs-repo-*-to-*/migration | sed -e 's/fs-repo/test_go.fs-repo/') +test_go: $(shell ls -d fs-repo-*-to-* | sed -e 's/fs-repo/test_go.fs-repo/') @echo OK test_go.%: MIGRATION=$* test_go.%: - @cd $(MIGRATION) && go test -mod=vendor + @cd $(MIGRATION)/migration && go test -mod=vendor diff --git a/fs-repo-10-to-11/migration/migration.go b/fs-repo-10-to-11/migration/migration.go index dc2244a4..bad3887d 100644 --- a/fs-repo-10-to-11/migration/migration.go +++ b/fs-repo-10-to-11/migration/migration.go @@ -11,14 +11,14 @@ import ( "github.com/ipfs/go-blockservice" "github.com/ipfs/go-datastore" "github.com/ipfs/go-filestore" - "github.com/ipfs/go-ipfs-blockstore" - "github.com/ipfs/go-ipfs-exchange-offline" + blockstore "github.com/ipfs/go-ipfs-blockstore" + offline "github.com/ipfs/go-ipfs-exchange-offline" "github.com/ipfs/go-ipfs-pinner/pinconv" "github.com/ipfs/go-ipfs/plugin/loader" "github.com/ipfs/go-ipfs/repo" "github.com/ipfs/go-ipfs/repo/fsrepo" "github.com/ipfs/go-ipfs/repo/fsrepo/migrations" - "github.com/ipfs/go-ipld-format" + format "github.com/ipfs/go-ipld-format" "github.com/ipfs/go-merkledag" migrate "github.com/ipfs/fs-repo-migrations/tools/go-migrate" @@ -88,7 +88,7 @@ func (m Migration) Apply(opts migrate.Options) error { err = migrations.WriteRepoVersion(opts.Path, toVer) if err != nil { - return fmt.Errorf("failed to update version file to %s: %v", toVer, err) + return fmt.Errorf("failed to update version file to %d: %v", toVer, err) } log.Print("updated version file")