Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates grpc proto deps #1053

Merged

Conversation

zachgersh
Copy link
Contributor

@zachgersh zachgersh commented Oct 1, 2019

Wanted to just bump the two most important dependencies but then had to make some modifications to the makefile so that everything would run correctly.

  • protobuf is now at 1.3.2
  • grpc at 1.24.0
  • go 1.13.1 (built with this and it makes a difference for the mod below)

This has also bumped gazelle up one minor to take advantage of the fact it supports go.mod replace directives.

Tested with:

  • codegen-swagger 2.2.2
  • protoc: 3.9.2
  • protoc-gen-go: 1.3.2

@zachgersh zachgersh force-pushed the updates-grpc-proto-deps branch from 1102112 to 8e05963 Compare October 1, 2019 22:56
@zachgersh
Copy link
Contributor Author

@johanbrandhorst - can we get jfbrandhorst/grpc-gateway-build-env:1.12 bumped to 1.13.1? Should be all it takes to get this back into working order (now that I got the bazel bits fixed).

Copy link
Collaborator

@johanbrandhorst johanbrandhorst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this, I will push a new version of jfbrandhorst/grpc-gateway-build-env and regenerate the files in the same PR, then you can rebase this on that.

@johanbrandhorst
Copy link
Collaborator

Please rebase on master.

Zach Gershman added 4 commits October 2, 2019 07:34
- sed was removed as it was slow and not
the canonical way to implement a replace of a go
package now that modules have been introduced
- go test commands were correct as the elipsis
was not testing the right thing
- test.Short was added to the rest of the integration
tests just in case users wanted to use the -short
directive and skip those (matching the style
throughout the rest of the integrations
- gazelle has a slightly different command you need to
use based on us using the go.mod to manage our
dependencies
@zachgersh zachgersh force-pushed the updates-grpc-proto-deps branch from 3bc5328 to d4d0db2 Compare October 2, 2019 14:52
- stops all the go.mod craziness since they've switched
between gopkg.in and github as their module name.
- need to upgrade this to v2 in reality but
that will depend on what swagger codegen
is doing
@codecov-io
Copy link

Codecov Report

Merging #1053 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1053   +/-   ##
=======================================
  Coverage   53.84%   53.84%           
=======================================
  Files          41       41           
  Lines        4147     4147           
=======================================
  Hits         2233     2233           
  Misses       1670     1670           
  Partials      244      244

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 78dc1a3...a4d3d1f. Read the comment docs.

@johanbrandhorst johanbrandhorst merged commit 5d50197 into grpc-ecosystem:master Oct 2, 2019
adasari pushed a commit to adasari/grpc-gateway that referenced this pull request Apr 9, 2020
* makefile now actually tests correctly

- sed was removed as it was slow and not
the canonical way to implement a replace of a go
package now that modules have been introduced
- go test commands were correct as the elipsis
was not testing the right thing
- test.Short was added to the rest of the integration
tests just in case users wanted to use the -short
directive and skip those (matching the style
throughout the rest of the integrations

* fixing the bazel bits

* re-run generation with newer circle dockerfile

* updates contributing to note usage of go.mod

- gazelle has a slightly different command you need to
use based on us using the go.mod to manage our
dependencies

* move backwards to resty 1.8.0

- stops all the go.mod craziness since they've switched
between gopkg.in and github as their module name.
- need to upgrade this to v2 in reality but
that will depend on what swagger codegen
is doing
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants