From 7e65c478158dacacc4b5e120231828bb78edb4eb Mon Sep 17 00:00:00 2001 From: Robert van Gent Date: Fri, 9 Aug 2019 14:08:01 -0700 Subject: [PATCH] all: release v0.16.0 (#2642) --- docstore/mongodocstore/go.mod | 4 +-- internal/cmd/gocdk/go.mod | 4 +-- .../gocdk/internal/static/_assets/init/go.mod | 2 +- internal/cmd/gocdk/internal/static/vfsdata.go | 2 +- internal/contributebot/go.mod | 4 +-- internal/docs/release.md | 16 +++++------ pubsub/kafkapubsub/go.mod | 4 +-- pubsub/natspubsub/go.mod | 4 +-- pubsub/rabbitpubsub/go.mod | 4 +-- runtimevar/etcdvar/go.mod | 4 +-- samples/go.mod | 28 +++++-------------- secrets/hashivault/go.mod | 4 +-- 12 files changed, 25 insertions(+), 55 deletions(-) diff --git a/docstore/mongodocstore/go.mod b/docstore/mongodocstore/go.mod index 87fa57f43e..3a011d8c8f 100644 --- a/docstore/mongodocstore/go.mod +++ b/docstore/mongodocstore/go.mod @@ -23,7 +23,5 @@ require ( github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect github.com/xdg/stringprep v1.0.0 // indirect go.mongodb.org/mongo-driver v1.0.3 - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 ) - -replace gocloud.dev => ../../ diff --git a/internal/cmd/gocdk/go.mod b/internal/cmd/gocdk/go.mod index 43509e644a..b89b82aae8 100644 --- a/internal/cmd/gocdk/go.mod +++ b/internal/cmd/gocdk/go.mod @@ -8,7 +8,7 @@ require ( github.com/shurcooL/httpfs v0.0.0-20190527155220-6a4d4a70508b // indirect github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd github.com/spf13/cobra v0.0.4 - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/sync v0.0.0-20190423024810-112230192c58 golang.org/x/sys v0.0.0-20190620070143-6f217b454f45 @@ -16,5 +16,3 @@ require ( golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522 google.golang.org/api v0.6.0 ) - -replace gocloud.dev => ../../../ diff --git a/internal/cmd/gocdk/internal/static/_assets/init/go.mod b/internal/cmd/gocdk/internal/static/_assets/init/go.mod index c2bab1a5c8..3128a02486 100644 --- a/internal/cmd/gocdk/internal/static/_assets/init/go.mod +++ b/internal/cmd/gocdk/internal/static/_assets/init/go.mod @@ -2,4 +2,4 @@ module {{.ModulePath}} go 1.12 -require gocloud.dev v0.15.1-0.20190719162155-012dbfe4bc92 +require gocloud.dev v0.16.0 diff --git a/internal/cmd/gocdk/internal/static/vfsdata.go b/internal/cmd/gocdk/internal/static/vfsdata.go index 4df2efe597..f671fd315d 100644 --- a/internal/cmd/gocdk/internal/static/vfsdata.go +++ b/internal/cmd/gocdk/internal/static/vfsdata.go @@ -150,7 +150,7 @@ var assets = func() http.FileSystem { "/init/go.mod": &vfsgen۰FileInfo{ name: "go.mod", modTime: time.Time{}, - content: []byte("\x6d\x6f\x64\x75\x6c\x65\x20\x7b\x7b\x2e\x4d\x6f\x64\x75\x6c\x65\x50\x61\x74\x68\x7d\x7d\x0a\x0a\x67\x6f\x20\x31\x2e\x31\x32\x0a\x0a\x72\x65\x71\x75\x69\x72\x65\x20\x67\x6f\x63\x6c\x6f\x75\x64\x2e\x64\x65\x76\x20\x76\x30\x2e\x31\x35\x2e\x31\x2d\x30\x2e\x32\x30\x31\x39\x30\x37\x31\x39\x31\x36\x32\x31\x35\x35\x2d\x30\x31\x32\x64\x62\x66\x65\x34\x62\x63\x39\x32\x0a"), + content: []byte("\x6d\x6f\x64\x75\x6c\x65\x20\x7b\x7b\x2e\x4d\x6f\x64\x75\x6c\x65\x50\x61\x74\x68\x7d\x7d\x0a\x0a\x67\x6f\x20\x31\x2e\x31\x32\x0a\x0a\x72\x65\x71\x75\x69\x72\x65\x20\x67\x6f\x63\x6c\x6f\x75\x64\x2e\x64\x65\x76\x20\x76\x30\x2e\x31\x36\x2e\x30\x0a"), }, "/init/main.go": &vfsgen۰CompressedFileInfo{ name: "main.go", diff --git a/internal/contributebot/go.mod b/internal/contributebot/go.mod index c819e08556..a329ee4462 100644 --- a/internal/contributebot/go.mod +++ b/internal/contributebot/go.mod @@ -8,11 +8,9 @@ require ( github.com/google/go-querystring v1.0.0 // indirect github.com/google/wire v0.3.0 go.opencensus.io v0.22.0 - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/sys v0.0.0-20190620070143-6f217b454f45 google.golang.org/api v0.6.0 google.golang.org/appengine v1.6.1 ) - -replace gocloud.dev => ../../ diff --git a/internal/docs/release.md b/internal/docs/release.md index 8c02f2e7b4..04a96b91f2 100644 --- a/internal/docs/release.md +++ b/internal/docs/release.md @@ -38,6 +38,14 @@ To do a release: [last release](https://github.com/google/go-cloud/releases/latest) was plus one, but follow [semantic versioning](https://semver.org/). +- Edit `./internal/cmd/gocdk/internal/static/_assets/init/go.mod` and update + the `requires` line for `gocloud.dev` to point to the new release name. + + Then run `go generate` in `./internal/cmd/gocdk`. This should produce an + updated `./internal/cmd/gocdk/internal/static/vfsdata.go`. + + Check that everything looks in order (with `git diff`) and commit. + - Run the release helper tool to set the version in `require` directives of submodules to the new (yet unreleased) version: @@ -47,14 +55,6 @@ To do a release: Check that everything looks in order (with `git diff`) and commit. -- Edit `./internal/cmd/gocdk/internal/static/_assets/init/go.mod` and update - the `requires` line for `gocloud.dev` to point to the new release name. - - Then run `go generate` in `./internal/cmd/gocdk`. This should produce an - updated `./internal/cmd/gocdk/internal/static/vfsdata.go`. - - Check that everything looks in order (with `git diff`) and commit. - - Create a PR. Travis will fail for this PR because submodules depend on a version of the main module that wasn't tagged yet. Enable force merging in GitHub settings and force-merge the PR. Note that this does not affect diff --git a/pubsub/kafkapubsub/go.mod b/pubsub/kafkapubsub/go.mod index e520d2d9e2..f7cf26bd83 100644 --- a/pubsub/kafkapubsub/go.mod +++ b/pubsub/kafkapubsub/go.mod @@ -18,7 +18,5 @@ require ( github.com/DataDog/zstd v1.4.0 // indirect github.com/Shopify/sarama v1.22.1 github.com/google/go-cmp v0.3.0 - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 ) - -replace gocloud.dev => ../../ diff --git a/pubsub/natspubsub/go.mod b/pubsub/natspubsub/go.mod index f060280e94..056c842956 100644 --- a/pubsub/natspubsub/go.mod +++ b/pubsub/natspubsub/go.mod @@ -18,7 +18,5 @@ require ( github.com/google/go-cmp v0.3.0 github.com/nats-io/nats-server/v2 v2.0.0 github.com/nats-io/nats.go v1.8.1 - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 ) - -replace gocloud.dev => ../../ diff --git a/pubsub/rabbitpubsub/go.mod b/pubsub/rabbitpubsub/go.mod index ea5d926c6a..29ded54d60 100644 --- a/pubsub/rabbitpubsub/go.mod +++ b/pubsub/rabbitpubsub/go.mod @@ -16,7 +16,5 @@ module gocloud.dev/pubsub/rabbitpubsub require ( github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 ) - -replace gocloud.dev => ../../ diff --git a/runtimevar/etcdvar/go.mod b/runtimevar/etcdvar/go.mod index 8a8d90c234..2d1a1db493 100644 --- a/runtimevar/etcdvar/go.mod +++ b/runtimevar/etcdvar/go.mod @@ -43,9 +43,7 @@ require ( go.uber.org/atomic v1.4.0 // indirect go.uber.org/multierr v1.1.0 // indirect go.uber.org/zap v1.10.0 // indirect - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 google.golang.org/grpc v1.21.1 gopkg.in/yaml.v2 v2.2.2 // indirect ) - -replace gocloud.dev => ../../ diff --git a/samples/go.mod b/samples/go.mod index 2b169e1b41..364dc692af 100644 --- a/samples/go.mod +++ b/samples/go.mod @@ -13,27 +13,13 @@ require ( github.com/gorilla/mux v1.7.2 github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 go.opencensus.io v0.22.0 - gocloud.dev v0.15.0 - gocloud.dev/docstore/mongodocstore v0.0.0-00010101000000-000000000000 - gocloud.dev/pubsub/kafkapubsub v0.15.0 - gocloud.dev/pubsub/natspubsub v0.15.0 - gocloud.dev/pubsub/rabbitpubsub v0.15.0 - gocloud.dev/runtimevar/etcdvar v0.15.0 - gocloud.dev/secrets/hashivault v0.15.0 + gocloud.dev v0.16.0 + gocloud.dev/docstore/mongodocstore v0.16.0 + gocloud.dev/pubsub/kafkapubsub v0.16.0 + gocloud.dev/pubsub/natspubsub v0.16.0 + gocloud.dev/pubsub/rabbitpubsub v0.16.0 + gocloud.dev/runtimevar/etcdvar v0.16.0 + gocloud.dev/secrets/hashivault v0.16.0 google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 gopkg.in/pipe.v2 v2.0.0-20140414041502-3c2ca4d52544 ) - -replace gocloud.dev => ../ - -replace gocloud.dev/docstore/mongodocstore => ../docstore/mongodocstore - -replace gocloud.dev/pubsub/kafkapubsub => ../pubsub/kafkapubsub - -replace gocloud.dev/pubsub/natspubsub => ../pubsub/natspubsub - -replace gocloud.dev/pubsub/rabbitpubsub => ../pubsub/rabbitpubsub - -replace gocloud.dev/runtimevar/etcdvar => ../runtimevar/etcdvar - -replace gocloud.dev/secrets/hashivault => ../secrets/hashivault diff --git a/secrets/hashivault/go.mod b/secrets/hashivault/go.mod index a5d0b3e1fa..1e81729d28 100644 --- a/secrets/hashivault/go.mod +++ b/secrets/hashivault/go.mod @@ -16,7 +16,5 @@ module gocloud.dev/secrets/hashivault require ( github.com/hashicorp/vault/api v1.0.2 - gocloud.dev v0.15.0 + gocloud.dev v0.16.0 ) - -replace gocloud.dev => ../../