certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: fix proto docker (#11423) 

* fix proto docker

* add back pull_request to test

* push

* push++

* revert
This commit is contained in:
Marko 2022-03-21 12:23:46 +01:00 committed by GitHub
parent d52982d623
commit 20735e792c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/proto-docker.yml vendored
View File

@ -1,6 +1,5 @@
name: Build & Push SDK Proto Builder name: Build & Push SDK Proto Builder
on: on:
pull_request:
push: push:
branches: branches:
- master - master
@ -40,7 +39,6 @@ jobs:
uses: docker/setup-buildx-action@v1 uses: docker/setup-buildx-action@v1
- name: Login to DockerHub - name: Login to DockerHub
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKERHUBTM_USERNAME }} username: ${{ secrets.DOCKERHUBTM_USERNAME }}
@ -52,5 +50,5 @@ jobs:
context: ./contrib/devtools context: ./contrib/devtools
file: ./contrib/devtools/dockerfile file: ./contrib/devtools/dockerfile
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }} push: true
tags: ${{ steps.prep.outputs.tags }} tags: ${{ steps.prep.outputs.tags }}

2
Makefile
View File

@ -393,7 +393,7 @@ devdoc-update:
### Protobuf ### ### Protobuf ###
############################################################################### ###############################################################################
protoVer=v0.3 protoVer=v0.4
protoImageName=tendermintdev/sdk-proto-gen:$(protoVer) protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer) containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
containerProtoGenAny=$(PROJECT_NAME)-proto-gen-any-$(protoVer) containerProtoGenAny=$(PROJECT_NAME)-proto-gen-any-$(protoVer)

4
api/cosmos/feegrant/v1beta1/feegrant.pulsar.go
View File

@ -2730,7 +2730,7 @@ type AllowedMsgAllowance struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
// allowance can be any of basic and filtered fee allowance. // allowance can be any of basic and periodic fee allowance.
Allowance *anypb.Any `protobuf:"bytes,1,opt,name=allowance,proto3" json:"allowance,omitempty"` Allowance *anypb.Any `protobuf:"bytes,1,opt,name=allowance,proto3" json:"allowance,omitempty"`
// allowed_messages are the messages for which the grantee has the access. // allowed_messages are the messages for which the grantee has the access.
AllowedMessages []string `protobuf:"bytes,2,rep,name=allowed_messages,json=allowedMessages,proto3" json:"allowed_messages,omitempty"` AllowedMessages []string `protobuf:"bytes,2,rep,name=allowed_messages,json=allowedMessages,proto3" json:"allowed_messages,omitempty"`
@ -2780,7 +2780,7 @@ type Grant struct {
Granter string `protobuf:"bytes,1,opt,name=granter,proto3" json:"granter,omitempty"` Granter string `protobuf:"bytes,1,opt,name=granter,proto3" json:"granter,omitempty"`
// grantee is the address of the user being granted an allowance of another user's funds. // grantee is the address of the user being granted an allowance of another user's funds.
Grantee string `protobuf:"bytes,2,opt,name=grantee,proto3" json:"grantee,omitempty"` Grantee string `protobuf:"bytes,2,opt,name=grantee,proto3" json:"grantee,omitempty"`
// allowance can be any of basic and filtered fee allowance. // allowance can be any of basic, periodic, allowed fee allowance.
Allowance *anypb.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"` Allowance *anypb.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"`
} }

2
api/cosmos/feegrant/v1beta1/tx.pulsar.go
View File

@ -1800,7 +1800,7 @@ type MsgGrantAllowance struct {
Granter string `protobuf:"bytes,1,opt,name=granter,proto3" json:"granter,omitempty"` Granter string `protobuf:"bytes,1,opt,name=granter,proto3" json:"granter,omitempty"`
// grantee is the address of the user being granted an allowance of another user's funds. // grantee is the address of the user being granted an allowance of another user's funds.
Grantee string `protobuf:"bytes,2,opt,name=grantee,proto3" json:"grantee,omitempty"` Grantee string `protobuf:"bytes,2,opt,name=grantee,proto3" json:"grantee,omitempty"`
// allowance can be any of basic and filtered fee allowance. // allowance can be any of basic, periodic, allowed fee allowance.
Allowance *anypb.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"` Allowance *anypb.Any `protobuf:"bytes,3,opt,name=allowance,proto3" json:"allowance,omitempty"`
} }

20
contrib/devtools/dockerfile
View File

@ -1,4 +1,4 @@
FROM bufbuild/buf:1.0.0-rc10 as BUILDER FROM bufbuild/buf:1.1.0 as BUILDER
FROM golang:alpine FROM golang:alpine
@ -7,17 +7,13 @@ ENV GOLANG_PROTOBUF_VERSION=1.27.1 \
GRPC_GATEWAY_VERSION=1.14.7 GRPC_GATEWAY_VERSION=1.14.7
RUN GO111MODULE=on go get \ RUN GO111MODULE=on go install github.com/cosmos/cosmos-proto/cmd/protoc-gen-go-pulsar@latest
github.com/cosmos/cosmos-proto/cmd/protoc-gen-go-pulsar@latest \ RUN GO111MODULE=on go install google.golang.org/protobuf/cmd/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION}
google.golang.org/protobuf/cmd/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION} \ RUN GO111MODULE=on go install github.com/gogo/protobuf/protoc-gen-gogo@v${GOGO_PROTOBUF_VERSION}
github.com/gogo/protobuf/protoc-gen-gogo@v${GOGO_PROTOBUF_VERSION} \ RUN GO111MODULE=on go install github.com/gogo/protobuf/protoc-gen-gogofast@v${GOGO_PROTOBUF_VERSION}
github.com/gogo/protobuf/protoc-gen-gogofast@v${GOGO_PROTOBUF_VERSION} \ RUN GO111MODULE=on go install github.com/gogo/protobuf/protoc-gen-gogofaster@v${GOGO_PROTOBUF_VERSION}
github.com/gogo/protobuf/protoc-gen-gogofaster@v${GOGO_PROTOBUF_VERSION} \ RUN GO111MODULE=on go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v${GRPC_GATEWAY_VERSION}
github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v${GRPC_GATEWAY_VERSION} \ RUN GO111MODULE=on go install 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} \
github.com/regen-network/cosmos-proto/protoc-gen-gocosmos@latest
RUN GO111MODULE=on go get -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
RUN apk add --no-cache \ RUN apk add --no-cache \
nodejs \ nodejs \