chore: fix proto docker (#11423)

* fix proto docker * add back pull_request to test * push * push++ * revert
cosmos · Mar 21, 2022 · 20735e7 · 20735e7
1 parent d52982d
commit 20735e7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/proto-docker.yml b/.github/workflows/proto-docker.yml
@@ -1,6 +1,5 @@
 name: Build & Push SDK Proto Builder
 on:
-  pull_request:
   push:
     branches:
       - master
@@ -40,7 +39,6 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
-        if: ${{ github.event_name != 'pull_request' }}
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUBTM_USERNAME }}
@@ -52,5 +50,5 @@ jobs:
           context: ./contrib/devtools
           file: ./contrib/devtools/dockerfile
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: ${{ steps.prep.outputs.tags }}
diff --git a/Makefile b/Makefile
@@ -393,7 +393,7 @@ devdoc-update:
 ###                                Protobuf                                 ###
 ###############################################################################
 
-protoVer=v0.3
+protoVer=v0.4
 protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
 containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
 containerProtoGenAny=$(PROJECT_NAME)-proto-gen-any-$(protoVer)

diff --git a/api/cosmos/feegrant/v1beta1/feegrant.pulsar.go b/api/cosmos/feegrant/v1beta1/feegrant.pulsar.go
diff --git a/api/cosmos/feegrant/v1beta1/tx.pulsar.go b/api/cosmos/feegrant/v1beta1/tx.pulsar.go
diff --git a/contrib/devtools/dockerfile b/contrib/devtools/dockerfile
@@ -1,4 +1,4 @@
-FROM bufbuild/buf:1.0.0-rc10 as BUILDER
+FROM bufbuild/buf:1.1.0 as BUILDER
 
 FROM golang:alpine
 
@@ -7,17 +7,13 @@ ENV GOLANG_PROTOBUF_VERSION=1.27.1 \
   GRPC_GATEWAY_VERSION=1.14.7
 
 
-RUN GO111MODULE=on go get \
-  github.com/cosmos/cosmos-proto/cmd/protoc-gen-go-pulsar@latest \
-  google.golang.org/protobuf/cmd/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION} \
-  github.com/gogo/protobuf/protoc-gen-gogo@v${GOGO_PROTOBUF_VERSION} \
-  github.com/gogo/protobuf/protoc-gen-gogofast@v${GOGO_PROTOBUF_VERSION} \
-  github.com/gogo/protobuf/protoc-gen-gogofaster@v${GOGO_PROTOBUF_VERSION} \
-  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/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 GO111MODULE=on go install 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}
+RUN GO111MODULE=on go install 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} 
+RUN GO111MODULE=on go install 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} 
+RUN GO111MODULE=on go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v${GRPC_GATEWAY_VERSION} 
 
 RUN apk add --no-cache \
   nodejs \