Skip to content

Commit

Permalink
build: enable orm proto gen in proto-builder (#15922)
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrbrt authored Apr 24, 2023
1 parent c7ed066 commit 3030cc4
Show file tree
Hide file tree
Showing 5 changed files with 691 additions and 668 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ lint-fix:
### Protobuf ###
###############################################################################

protoVer=0.12.0
protoVer=0.13.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

Expand Down
3 changes: 2 additions & 1 deletion contrib/devtools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ ENV GOLANG_PROTOBUF_VERSION=1.28.1 \
RUN go install github.com/cosmos/cosmos-proto/cmd/protoc-gen-go-pulsar@latest && \
go install google.golang.org/protobuf/cmd/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION} && \
go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v${GRPC_GATEWAY_VERSION} \
github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v${GRPC_GATEWAY_VERSION}
github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v${GRPC_GATEWAY_VERSION} && \
go install cosmossdk.io/orm/cmd/[email protected]

# install all gogo protobuf binaries
RUN git clone https://github.com/cosmos/gogoproto.git; \
Expand Down
2 changes: 1 addition & 1 deletion proto/buf.gen.gogo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: v1
plugins:
- name: gocosmos
out: ..
opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types
opt: plugins=grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types,Mcosmos/orm/v1/orm.proto=cosmossdk.io/orm
- name: grpc-gateway
out: ..
opt: logtostderr=true,allow_colon_final_segments=true
3 changes: 3 additions & 0 deletions proto/buf.gen.pulsar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ plugins:
- name: go-grpc
out: ../api
opt: paths=source_relative
- name: go-cosmos-orm
out: ../api
opt: paths=source_relative
Loading

0 comments on commit 3030cc4

Please sign in to comment.