All Makefile proto commands use Docker #7931
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
amaury1093
changed the title
amaury1093
requested review from
aaronc,
alessio and
alexanderbez
as code owners
Codecov Report
@@ Coverage Diff @@
## master #7931 +/- ##
=======================================
Coverage 54.17% 54.17%
=======================================
Files 612 612
Lines 38999 38999
=======================================
Hits 21129 21129
Misses 15697 15697
Partials 2173 2173 |
amaury1093
commented
Nov 13, 2020
|
|
||
| # This generates the SDK's custom wrapper for google.protobuf.Any. It should only be run manually when needed | ||
| proto-gen-any: | ||
| @./scripts/protocgen-any.sh | ||
| docker run -v $(shell pwd):/workspace --workdir /workspace tendermintdev/sdk-proto-gen sh ./scripts/protocgen-any.sh | ||
|
|
||
| proto-swagger-gen: | ||
| @./scripts/protoc-swagger-gen.sh |
There was a problem hiding this comment.
Unfortunately, this one still uses local protoc, because it relies to swagger-combine. I created #7933 to track this.
alessio
approved these changes
Nov 13, 2020
tac0turtle
reviewed
Nov 13, 2020
tac0turtle
approved these changes
Nov 13, 2020
alessio
reviewed
Nov 13, 2020
robert-zaremba
approved these changes
Nov 13, 2020
amaury1093
added
the
A:automerge
|
I've merged this in by hand as automerge does not work when there are changes in |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
follow-up: #7332
follow-up: #7901 (comment)
closes: #7851
ref: #7893 (comment)
Problem
Too many user errors when generating from proto files (wrong buf, protoc, protoc-gen-gocosmos...). It has been decided in #7332 to use Docker
However, some Makefile commands still use the local binaries.
Proposed Solution
To test the commands: I ran all the
proto-*commands, and the output is committed in this PR. It'd be nice if someone would run the commands again, to make sure there's no file diff.Additional Notes
If you absolutely don't want to run Docker, then you should 1/ make sure your tooling is correctly installed locally, with the same versions as those in the Dockerfile and 2/ run the scripts directly, e.g.
$ ./scripts/protocgen.sh.This should be a niche case for advanced users, so I prefer to remove this use case from the Makefile.
Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.
docs/) or specification (x/<module>/spec/)godoccomments.Unreleasedsection inCHANGELOG.mdFiles changedin the Github PR explorerCodecov Reportin the comment section below once CI passes