From cfa0e76c89e12148d9ee38b2e47b05d086a901c8 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Wed, 26 Feb 2020 16:56:56 -0600 Subject: [PATCH 1/9] define custom install to make go modules work --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e666eb0..eb609d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,3 @@ -go_import_path: github.com/spf13/viper - language: go env: @@ -19,6 +17,10 @@ matrix: - go: tip fast_finish: true +install: + - gimme 1.14.x + - go mod vendor + script: - go mod tidy - diff -u <(echo -n) <(gofmt -d .) From 713af2cac427f14a6d01e0ee2a5a956f2b3d7ae4 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Wed, 26 Feb 2020 17:01:06 -0600 Subject: [PATCH 2/9] hacks from other travis users --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb609d3..28e0022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,14 +17,12 @@ matrix: - go: tip fast_finish: true -install: - - gimme 1.14.x - - go mod vendor +install: true script: - go mod tidy - diff -u <(echo -n) <(gofmt -d .) - - go test -v ./ + - go test -v -mod=vendor ./... after_success: - go get -u -d github.com/spf13/hugo From 146f6890449b82d596cea52c0fc81853bcfe8a29 Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Wed, 26 Feb 2020 17:07:36 -0600 Subject: [PATCH 3/9] start the script by vendoring first --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 28e0022..abb4a98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ matrix: install: true script: - - go mod tidy + - go mod vendor - diff -u <(echo -n) <(gofmt -d .) - go test -v -mod=vendor ./... From 31f45ebfd6b02a67ca24115a4eba43797da84e11 Mon Sep 17 00:00:00 2001 From: Matthew Hardwick Date: Thu, 27 Feb 2020 09:59:02 -0500 Subject: [PATCH 4/9] try build with -mod=readonly for test command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abb4a98..d36ec12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ install: true script: - go mod vendor - diff -u <(echo -n) <(gofmt -d .) - - go test -v -mod=vendor ./... + - go test -v -mod=readonly ./... after_success: - go get -u -d github.com/spf13/hugo From 2922e4434fc093db33baca1182a455b8a1ef2356 Mon Sep 17 00:00:00 2001 From: Matthew Hardwick Date: Thu, 27 Feb 2020 10:30:37 -0500 Subject: [PATCH 5/9] Try fixing go.mod problem from `ugorji/go/codec` https://github.com/ugorji/go/issues/299 https://github.com/ugorji/go/issues/318 https://github.com/ugorji/go/pull/319 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6a7b0a9..7d6bd07 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,7 @@ require ( github.com/spf13/viper v1.6.2 github.com/stretchr/testify v1.4.0 github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc // indirect - github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect + github.com/ugorji/go/codec v1.1.7 // indirect github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 go.uber.org/zap v1.14.0 // indirect golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect From 7d500a2af36ebb859ce72405c3678a31746a1f0f Mon Sep 17 00:00:00 2001 From: Matthew Hardwick Date: Thu, 27 Feb 2020 10:51:42 -0500 Subject: [PATCH 6/9] bump patch for etcd https://github.com/etcd-io/etcd/issues/11475 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7d6bd07..76db260 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect github.com/coreos/bbolt v1.3.3 // indirect - github.com/coreos/etcd v3.3.10+incompatible // indirect + github.com/coreos/etcd v3.3.13+incompatible // indirect github.com/coreos/go-etcd v2.0.0+incompatible // indirect github.com/coreos/go-semver v0.2.0 // indirect github.com/fsnotify/fsnotify v1.4.7 From 8a855103ac08d36c814f816932172c00ea511b33 Mon Sep 17 00:00:00 2001 From: Matthew Hardwick Date: Thu, 27 Feb 2020 11:18:38 -0500 Subject: [PATCH 7/9] try excluding vendor from gofmt --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d36ec12..2dc9cff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ install: true script: - go mod vendor - - diff -u <(echo -n) <(gofmt -d .) + - diff -u <(echo -n) <(gofmt -d $(go list ./... | grep -v /vendor/)) - go test -v -mod=readonly ./... after_success: From 940e2f6b8254906fbf73d38dd5e2a00888383b0f Mon Sep 17 00:00:00 2001 From: MRHwick Date: Thu, 27 Feb 2020 11:28:17 -0500 Subject: [PATCH 8/9] move travis diff call to before vendoring --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2dc9cff..f642de7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ matrix: install: true script: + - diff -u <(echo -n) <(gofmt -d .) - go mod vendor - - diff -u <(echo -n) <(gofmt -d $(go list ./... | grep -v /vendor/)) - go test -v -mod=readonly ./... after_success: From bf41424e1c48d63cc4dc9af712033e389547d77b Mon Sep 17 00:00:00 2001 From: Cody Lee Date: Thu, 27 Feb 2020 10:38:11 -0600 Subject: [PATCH 9/9] add back go.sum --- go.sum | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/go.sum b/go.sum index 94e6eef..ca70bf0 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,8 @@ github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY= github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible h1:8F3hqu9fGYLBifCmRCJsicFqDx/D68Rt3q1JMazcgBQ= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -89,6 +91,7 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -113,8 +116,10 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -184,8 +189,10 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc h1:yUaosF github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow=