From 5843555f6ff2922016014cb786f10b1309497ba8 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Fri, 5 Aug 2022 09:42:31 +0200 Subject: [PATCH] vendor: Automatically vendor protobuf modules. --- Makefile | 2 -- go.mod | 2 +- vendor_helper_test.go | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9065f6f..6bcaea8 100644 --- a/Makefile +++ b/Makefile @@ -157,8 +157,6 @@ vendor: go.mod go.sum common mkdir -p $(VENDORDIR)/google.golang.org/grpc/cmd/protoc-gen-go-grpc/; \ cp -rf --no-preserve=mode $(GOPATH)/pkg/mod/google.golang.org/grpc/cmd/protoc-gen-go-grpc@$(PROTOC_GEN_GRPC_VERSION)/* $(VENDORDIR)/google.golang.org/grpc/cmd/protoc-gen-go-grpc/; \ cp -rf --no-preserve=mode $$PROTOBUF_DIR/cmd/ $(VENDORDIR)/google.golang.org/protobuf/; \ - cp -rf --no-preserve=mode $$PROTOBUF_DIR/compiler/ $(VENDORDIR)/google.golang.org/protobuf/; \ - cp -rf --no-preserve=mode $$PROTOBUF_DIR/types/ $(VENDORDIR)/google.golang.org/protobuf/; \ tarball: vendor git archive \ diff --git a/go.mod b/go.mod index 42d60b1..d7f8840 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( go.etcd.io/etcd/client/v3 v3.5.4 go.etcd.io/etcd/server/v3 v3.5.4 google.golang.org/grpc v1.48.0 + google.golang.org/protobuf v1.28.1 ) require ( @@ -79,7 +80,6 @@ require ( golang.org/x/text v0.3.6 // indirect golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect - google.golang.org/protobuf v1.28.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect sigs.k8s.io/yaml v1.2.0 // indirect diff --git a/vendor_helper_test.go b/vendor_helper_test.go index 0166898..67a4b64 100644 --- a/vendor_helper_test.go +++ b/vendor_helper_test.go @@ -26,4 +26,5 @@ import ( _ "github.com/mailru/easyjson/bootstrap" _ "github.com/mailru/easyjson/gen" _ "github.com/mailru/easyjson/parser" + _ "google.golang.org/protobuf/compiler/protogen" )