From 5be81970f6ff048c2ed5d333d6c374f811c2335a Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 13 May 2019 11:16:39 -0700 Subject: [PATCH 1/4] dep: update go-cid So we can force upstream to update, even if they don't directly depend on go-cid. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b4caf2f..f56c453 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,6 @@ module github.com/ipfs/go-ipld-format require ( github.com/ipfs/go-block-format v0.0.2 - github.com/ipfs/go-cid v0.0.1 + github.com/ipfs/go-cid v0.0.2 github.com/multiformats/go-multihash v0.0.1 ) diff --git a/go.sum b/go.sum index aa764c6..79b1fea 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,8 @@ github.com/ipfs/go-block-format v0.0.2 h1:qPDvcP19izTjU8rgo6p7gTXZlkMkF5bz5G3fqI github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY= github.com/ipfs/go-cid v0.0.1 h1:GBjWPktLnNyX0JiQCNFpUuUSoMw5KMyqrsejHYlILBE= github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= +github.com/ipfs/go-cid v0.0.2 h1:tuuKaZPU1M6HcejsO3AcYWW8sZ8MTvyxfc4uqB4eFE8= +github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM= github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50= github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc= github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g= From 3eb4d8910b91a52e37356618473c18d83a6ab2c4 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 13 May 2019 11:21:10 -0700 Subject: [PATCH 2/4] remove gx support --- .travis.yml | 2 -- package.json | 36 ------------------------------------ 2 files changed, 38 deletions(-) delete mode 100644 package.json diff --git a/.travis.yml b/.travis.yml index 4cfe98c..5163d69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ env: global: - GOTFLAGS="-race" matrix: - - BUILD_DEPTYPE=gx - BUILD_DEPTYPE=gomod @@ -24,7 +23,6 @@ script: cache: directories: - - $GOPATH/src/gx - $GOPATH/pkg/mod - $HOME/.cache/go-build diff --git a/package.json b/package.json deleted file mode 100644 index ca1ff9b..0000000 --- a/package.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "author": "whyrusleeping", - "bugs": { - "url": "https://github.com/ipfs/go-ipld-format" - }, - "gx": { - "dvcsimport": "github.com/ipfs/go-ipld-format" - }, - "gxDependencies": [ - { - "author": "whyrusleeping", - "hash": "QmTbxNB1NwDesLmKTscr4udL2tVP7MaxvXnD1D9yX7g3PN", - "name": "go-cid", - "version": "0.9.3" - }, - { - "author": "stebalien", - "hash": "QmYYLnAzR28nAQ4U5MFniLprnktu6eTFKibeNt96V21EZK", - "name": "go-block-format", - "version": "0.2.2" - }, - { - "author": "multiformats", - "hash": "QmerPMzPk1mJVowm8KgmoknWa4yCYvvugMPsgWmDNUvDLW", - "name": "go-multihash", - "version": "1.0.9" - } - ], - "gxVersion": "0.10.0", - "language": "go", - "license": "", - "name": "go-ipld-format", - "releaseCmd": "git commit -a -m \"gx publish $VERSION\"", - "version": "0.8.1" -} - From 137db0358f0d0b80955a252308deb558e11c31bb Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 13 May 2019 11:21:53 -0700 Subject: [PATCH 3/4] go fmt --- walker.go | 1 - 1 file changed, 1 deletion(-) diff --git a/walker.go b/walker.go index a0c4bbe..8138093 100644 --- a/walker.go +++ b/walker.go @@ -88,7 +88,6 @@ type Walker struct { // * Active node. // * Path to the active node. - // Function called each time a node is arrived upon in a walk operation // through the `down` method (not when going back `up`). It is the main // API to implement DAG functionality (e.g., read and seek a file DAG) From f84aaea695c2a9ac8b439215d4fe11c8dc2d505a Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Mon, 13 May 2019 11:22:00 -0700 Subject: [PATCH 4/4] ci: update go --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5163d69..ba87d9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ os: language: go go: - - 1.11.x + - 1.12.x env: global: