From 243cdcca6952a95746db3ac8c277b506e11638c4 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 20 Aug 2020 18:34:55 +0200 Subject: [PATCH 1/2] Use `go install` instead of `go get` for protoc dependencies --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b0b25fdf5a..ede5e42bb9 100644 --- a/Makefile +++ b/Makefile @@ -158,16 +158,16 @@ watch: go run github.com/cespare/reflex -c reflex.conf $(GOPATH)/bin/protoc-gen-go: - GO111MODULE=off go get -v github.com/golang/protobuf/protoc-gen-go + GO111MODULE=off go install github.com/golang/protobuf/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro: - GO111MODULE=on go get -v github.com/micro/protoc-gen-micro/v2 + GO111MODULE=on go install github.com/micro/protoc-gen-micro/v2 $(GOPATH)/bin/protoc-gen-microweb: - GO111MODULE=off go get -v github.com/owncloud/protoc-gen-microweb + GO111MODULE=off go install github.com/owncloud/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger: - GO111MODULE=off go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger + GO111MODULE=off go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger $(PROTO_SRC)/settings.pb.go: $(PROTO_SRC)/settings.proto protoc \ From 686123fc7d116f10338ad5c6ba447e807b90cab2 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Thu, 20 Aug 2020 18:46:19 +0200 Subject: [PATCH 2/2] populate protoc plugins by absolute path --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index ede5e42bb9..c2c65d5e01 100644 --- a/Makefile +++ b/Makefile @@ -171,24 +171,28 @@ $(GOPATH)/bin/protoc-gen-swagger: $(PROTO_SRC)/settings.pb.go: $(PROTO_SRC)/settings.proto protoc \ + --plugin=protoc-gen-go=$GOPATH/bin/protoc-gen-go \ -I=third_party/ \ -I=$(PROTO_SRC)/ \ --go_out=. settings.proto $(PROTO_SRC)/settings.pb.micro.go: $(PROTO_SRC)/settings.proto protoc \ + --plugin=protoc-gen-micro=$GOPATH/bin/protoc-gen-micro \ -I=third_party/ \ -I=$(PROTO_SRC)/ \ --micro_out=. settings.proto $(PROTO_SRC)/settings.pb.web.go: $(PROTO_SRC)/settings.proto protoc \ + --plugin=protoc-gen-microweb=$GOPATH/bin/protoc-gen-microweb \ -I=third_party/ \ -I=$(PROTO_SRC)/ \ --microweb_out=. settings.proto $(PROTO_SRC)/settings.swagger.json: $(PROTO_SRC)/settings.proto protoc \ + --plugin=protoc-gen-swagger=$GOPATH/bin/protoc-gen-swagger \ -I=third_party/ \ -I=$(PROTO_SRC)/ \ --swagger_out=$(PROTO_SRC) settings.proto