Skip to content

Commit

Permalink
protobuf: match protoc-gen-go to the protobuf version
Browse files Browse the repository at this point in the history
The Go protoc plugin (protoc-gen-go) and the protobuf package itself
need to match versions. The previous Makefile installed the master
version of the plugin, but dep pinned protobuf itself to 1.1.0, and now
we're seeing problems on some developer machines where protobuf
complains about a mismatch.

This commit fixes the problem using an implementation from developer
discussion on

    golang/protobuf#763

and regenerates the protobuf using the new (old) plugin.

Fixes greenplum-db/gpupgrade#99 .
  • Loading branch information
jchampio authored and kalensk committed Aug 27, 2019
1 parent cb6edc3 commit eb47bb2
Show file tree
Hide file tree
Showing 5 changed files with 87 additions and 76 deletions.
8 changes: 7 additions & 1 deletion Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
# go-tests = true
# unused-packages = true

# Tool dependencies. In general we want to control our dependencies via
# Gopkg.lock instead of having `go get` pull in the latest master versions.
required = [
"github.com/golang/protobuf/protoc-gen-go"
]

[[constraint]]
name = "github.com/cloudfoundry/gosigar"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ depend:
dep ensure

depend-dev: depend
go get -u github.com/golang/protobuf/protoc-gen-go
go install ./vendor/github.com/golang/protobuf/protoc-gen-go
go get golang.org/x/tools/cmd/goimports
go get github.com/golang/lint/golint
go get github.com/alecthomas/gometalinter
Expand Down
82 changes: 41 additions & 41 deletions idl/cli_to_hub.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit eb47bb2

Please sign in to comment.