diff --git a/.github/workflows/proto-registry.yml b/.github/workflows/proto-registry.yml index fcf78af031..5ab302ae2b 100644 --- a/.github/workflows/proto-registry.yml +++ b/.github/workflows/proto-registry.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: bufbuild/buf-setup-action@v1.18.0 + - uses: bufbuild/buf-setup-action@v1.19.0 - uses: bufbuild/buf-push-action@v1 with: input: "proto" diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml index 440807808d..e0dfb1b043 100644 --- a/.github/workflows/proto.yml +++ b/.github/workflows/proto.yml @@ -15,7 +15,7 @@ jobs: timeout-minutes: 5 steps: - uses: actions/checkout@v3 - - uses: bufbuild/buf-setup-action@v1.18.0 + - uses: bufbuild/buf-setup-action@v1.19.0 - uses: bufbuild/buf-lint-action@v1 with: input: "proto" @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: bufbuild/buf-setup-action@v1.18.0 + - uses: bufbuild/buf-setup-action@v1.19.0 - uses: bufbuild/buf-breaking-action@v1 with: input: "proto" diff --git a/Makefile b/Makefile index 1da24acecc..770a3690cf 100644 --- a/Makefile +++ b/Makefile @@ -398,7 +398,7 @@ lint-fix: ### Protobuf ### ############################################################################### -protoVer=0.13.0 +protoVer=0.13.1 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) diff --git a/contrib/devtools/Dockerfile b/contrib/devtools/Dockerfile index 4d878e48ec..616758f7fd 100644 --- a/contrib/devtools/Dockerfile +++ b/contrib/devtools/Dockerfile @@ -2,7 +2,7 @@ # docker build --pull --rm -f "contrib/devtools/Dockerfile" -t cosmossdk-proto:latest "contrib/devtools" # docker run --rm -v $(pwd):/workspace --workdir /workspace cosmossdk-proto sh ./scripts/protocgen.sh -FROM bufbuild/buf:1.17.0 as BUILDER +FROM bufbuild/buf:1.19.0 as BUILDER FROM golang:1.20-alpine RUN apk add --no-cache \ @@ -10,7 +10,8 @@ RUN apk add --no-cache \ npm \ git \ make \ - clang-extra-tools + clang-extra-tools \ + g++ RUN npm install -g swagger-combine @@ -26,7 +27,7 @@ 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} && \ - go install cosmossdk.io/orm/cmd/protoc-gen-go-cosmos-orm@v1.0.0-beta.1 + go install cosmossdk.io/orm/cmd/protoc-gen-go-cosmos-orm@v1.0.0-beta.3 # install all gogo protobuf binaries RUN git clone https://github.com/cosmos/gogoproto.git; \