From 180c7535d782b94f2978bc0676119b00f546bf23 Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 27 Apr 2022 21:23:21 +0000 Subject: [PATCH] Upgrade protoc, protoc-gen-go and protoc-gen-go-grpc Signed-off-by: Kazuyoshi Kato --- script/setup/install-dev-tools | 11 ++--------- script/setup/install-protobuf | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index c615b1c3f..308b1e2a0 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -25,13 +25,6 @@ go install github.com/containerd/protobuild@v0.2.0 go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.2.0 go install github.com/cpuguy83/go-md2man/v2@v2.0.1 go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.0 -go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 -go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1 +go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 +go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@944ef4a40df3446714a823207972b7d9858ffac5 - -# the following packages need to exist in $GOPATH so we can't use -# go modules-aware mode of `go get` for these includes used during -# proto building -cd "$GOPATH" -GO111MODULE=off go get -d github.com/gogo/googleapis || true -GO111MODULE=off go get -d github.com/gogo/protobuf || true diff --git a/script/setup/install-protobuf b/script/setup/install-protobuf index 8c603a79a..81e7a4a63 100755 --- a/script/setup/install-protobuf +++ b/script/setup/install-protobuf @@ -20,7 +20,7 @@ # set -eu -o pipefail -PROTOBUF_VERSION=3.11.4 +PROTOBUF_VERSION=3.20.1 GOARCH=$(go env GOARCH) GOOS=$(go env GOOS) PROTOBUF_DIR=$(mktemp -d)