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.

Sign up for GitHub

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

All Makefile proto commands use Docker #7931

Merged
merged 8 commits into from
Nov 13, 2020
Merged

All Makefile proto commands use Docker #7931

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
04159e6
Update tooling around docker
amaury1093 Nov 13, 2020
cc4a88e
Run commands
amaury1093 Nov 13, 2020
a474962
Remove swagger gen for now
amaury1093 Nov 13, 2020
2de2ad7
Update proto-gen-any
amaury1093 Nov 13, 2020
217a551
Fix indentn
amaury1093 Nov 13, 2020
ab83b35
Use CURDIR
amaury1093 Nov 13, 2020
a73d88c
Merge branch 'master' into am-contributing
Nov 13, 2020
1ff4a75
Merge branch 'master' into am-contributing
Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update proto-gen-any
  • Loading branch information
@amaury1093
amaury1093 committed Nov 13, 2020
commit 2de2ad7ab071c09fadf6cb8497d39ec1ad3ee946
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ proto-format:

# 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
tac0turtle marked this conversation as resolved.
Show resolved Hide resolved
amaury1093 marked this conversation as resolved.
Show resolved Hide resolved

proto-swagger-gen:
@./scripts/protoc-swagger-gen.sh
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately, this one still uses local protoc, because it relies to swagger-combine. I created #7933 to track this.

Expand Down
43 changes: 20 additions & 23 deletions codec/types/any.pb.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions scripts/protocgen-any.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ set -eo pipefail

go install github.com/gogo/protobuf/protoc-gen-gogotypes

buf protoc -I. --gogotypes_out=./codec/types third_party/proto/google/protobuf/any.proto
mv codec/types/third_party/proto/google/protobuf/any.pb.go codec/types
buf protoc -I "third_party/proto" --gogotypes_out=./codec/types third_party/proto/google/protobuf/any.proto
mv codec/types/google/protobuf/any.pb.go codec/types
rm -rf codec/types/third_party

# This removes the call to RegisterType in the custom generated Any wrapper
Expand Down