From 7bfcd456130321372c8d59dc3434a94dcbff37d5 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 15:11:58 -0700 Subject: [PATCH 01/11] ci: shift travis env variable declarations, and remove gx DEBTYPE --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3621487fb..720f7020a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,16 +11,16 @@ services: env: global: + - GO111MODULE=on - GOTFLAGS="-race" - IPFS_PATH=/tmp/ipfs - matrix: - - BUILD_DEPTYPE=gx - - BUILD_DEPTYPE=gomod + # - BUILD_DEBTYPE=gomod commented out for now before_install: - docker pull ipfs/go-ipfs:master - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs - docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master --enable-pubsub-experiment + - go mod download # disable travis install From 94924ea63f5deb517aab90a2ed36d0b3c9a3b7bd Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 15:22:42 -0700 Subject: [PATCH 02/11] ci: remove no-op build flag from script, enable gomod DEBTYPE --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 720f7020a..fcfc5e5e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - GO111MODULE=on - GOTFLAGS="-race" - IPFS_PATH=/tmp/ipfs - # - BUILD_DEBTYPE=gomod commented out for now + - BUILD_DEBTYPE=gomod before_install: - docker pull ipfs/go-ipfs:master @@ -28,7 +28,7 @@ install: - true script: - - go get -d -t github.com/cheekybits/is/... # remove with gx + - go get -d github.com/cheekybits/is/... # remove with gx - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) From 2e77a2165784c70cfa30cb6b84cb3ab14b63261c Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 15:26:24 -0700 Subject: [PATCH 03/11] chi: disable suspected run-standard-tests.sh --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fcfc5e5e5..22b754018 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,11 @@ install: script: - go get -d github.com/cheekybits/is/... # remove with gx - - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) + - go test -race -cover ./... +# - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) + +after_success: + - bash <(curl -s https://codecov.io/bash) cache: From e5224651432c1f564fee1345499fd58604c953c5 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 15:30:38 -0700 Subject: [PATCH 04/11] ci: add install section to download deps, add before_script --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22b754018..f307306b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,12 @@ before_install: - docker pull ipfs/go-ipfs:master - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs - docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master --enable-pubsub-experiment - - go mod download - -# disable travis install install: - - true + - go mod download + +before_script: +- go vet ./... script: - go get -d github.com/cheekybits/is/... # remove with gx From 616dcea4b1872c75b303207dac392272e5fd2140 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 16:15:42 -0700 Subject: [PATCH 05/11] ci: fix docker run in before_install --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f307306b9..88f4c9272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ env: before_install: - docker pull ipfs/go-ipfs:master - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs - - docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master --enable-pubsub-experiment - + - docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master "daemon" "--enable-namesys-pubsub" + install: - go mod download From bdf51812f7774b6ae6dc91888438e64c5c6e89a2 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 16:27:59 -0700 Subject: [PATCH 06/11] shell: fix failing tests due to new base type --- shell_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell_test.go b/shell_test.go index 87b1a966d..16ec64acb 100644 --- a/shell_test.go +++ b/shell_test.go @@ -30,7 +30,7 @@ func TestAdd(t *testing.T) { is.Equal(mhash, "QmUfZ9rAdhV5ioBzXKdUTh2ZNsz9bzbkaLVyQ8uc8pj21F") mhash, err = s.Add(bytes.NewBufferString("Hello IPFS Shell tests"), Hash("sha3-256")) is.Nil(err) - is.Equal(mhash, "zb2wwqxjxosf8GKEZCwAWSFZ879XFNca3De5yAoh5b2axAffc") + is.Equal(mhash, "bafkrmidz7cuqruceo2hocadpdjppcsi7qw6dypz3jhsae2qda6sexdk6z4") } func TestRedirect(t *testing.T) { @@ -330,7 +330,7 @@ func TestDagPut(t *testing.T) { c, err := s.DagPut(`{"x": "abc","y":"def"}`, "json", "cbor") is.Nil(err) - is.Equal(c, "zdpuAt47YjE9XTgSxUBkiYCbmnktKajQNheQBGASHj3FfYf8M") + is.Equal(c, "bafyreidrm3r2k6vlxqp2fk47sboeycf7apddib47w7cyagrajtpaxxl2pi") } func TestDagPutWithOpts(t *testing.T) { From 3a181f93af30123c188c663dd831bb770a908212 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 16:45:31 -0700 Subject: [PATCH 07/11] shell: fix DagPutWithOpts test --- shell_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell_test.go b/shell_test.go index 16ec64acb..b7d2de3bd 100644 --- a/shell_test.go +++ b/shell_test.go @@ -339,7 +339,7 @@ func TestDagPutWithOpts(t *testing.T) { c, err := s.DagPutWithOpts(`{"x": "abc","y":"def"}`, options.Dag.Pin("true")) is.Nil(err) - is.Equal(c, "zdpuAt47YjE9XTgSxUBkiYCbmnktKajQNheQBGASHj3FfYf8M") + is.Equal(c, "bafyreidrm3r2k6vlxqp2fk47sboeycf7apddib47w7cyagrajtpaxxl2pi") } func TestStatsBW(t *testing.T) { From 510a433b817052baf64b6a8733bb4b45a54f88ab Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 17:10:18 -0700 Subject: [PATCH 08/11] ci: re-enable standard test run --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88f4c9272..7910fca9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,12 +29,7 @@ before_script: script: - go get -d github.com/cheekybits/is/... # remove with gx - - go test -race -cover ./... -# - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) - -after_success: - - bash <(curl -s https://codecov.io/bash) - + - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) cache: directories: From 5aba8d78d6bedb4bdc53a9818dd4a148632811b3 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 17:22:27 -0700 Subject: [PATCH 09/11] ci: disable run-standard-tests.sh --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7910fca9a..daace6e02 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,16 @@ install: - go mod download before_script: -- go vet ./... + - go vet ./... script: - go get -d github.com/cheekybits/is/... # remove with gx - - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) + - go test -race -cover ./... + # - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) + +after_success: + - bash <(curl -s https://codecov.io/bash) + cache: directories: From 79f65cbaf60d6bc4fd076dec95fbf23d4c9fae38 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 17:38:15 -0700 Subject: [PATCH 10/11] ci: another attempt at re-enabling run-standard-tests.sh --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index daace6e02..66eacf754 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ env: - GO111MODULE=on - GOTFLAGS="-race" - IPFS_PATH=/tmp/ipfs + matrix: - BUILD_DEBTYPE=gomod before_install: @@ -29,11 +30,7 @@ before_script: script: - go get -d github.com/cheekybits/is/... # remove with gx - - go test -race -cover ./... - # - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) - -after_success: - - bash <(curl -s https://codecov.io/bash) + - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh) cache: From 9fba235b664060f31e445e7aedc4919e907151f0 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 22 May 2019 17:44:24 -0700 Subject: [PATCH 11/11] ci: fix typo to BUILD_DEPTYPE from BUILD_DEBTYPE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66eacf754..dcf41797e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: - GOTFLAGS="-race" - IPFS_PATH=/tmp/ipfs matrix: - - BUILD_DEBTYPE=gomod + - BUILD_DEPTYPE=gomod before_install: - docker pull ipfs/go-ipfs:master