From 2c862bbfb407056a6486c994c5c3b97362213e07 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 21 Aug 2020 15:12:23 +0200
Subject: [PATCH 1/2] Fix GOPATH variable usage

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c2c65d5e..a6115397 100644
--- a/Makefile
+++ b/Makefile
@@ -171,28 +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 \
+		--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 \
+		--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 \
+		--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 \
+		--plugin=protoc-gen-swagger=$(GOPATH)/bin/protoc-gen-swagger \
 		-I=third_party/ \
 		-I=$(PROTO_SRC)/ \
 		--swagger_out=$(PROTO_SRC) settings.proto

From c214976f22ca7388bce3e408495dc91c07ad945a Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Fri, 21 Aug 2020 15:14:14 +0200
Subject: [PATCH 2/2] Include protobuf step in build steps

---
 .drone.star | 4 ++--
 Makefile    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.drone.star b/.drone.star
index 749fa26a..412b7eae 100644
--- a/.drone.star
+++ b/.drone.star
@@ -104,7 +104,7 @@ def testing(ctx):
         'image': 'webhippie/golang:1.13',
         'pull': 'always',
         'commands': [
-          'make build',
+          'make protobuf build',
         ],
         'volumes': [
           {
@@ -193,7 +193,7 @@ def docker(ctx, arch):
         'image': 'webhippie/golang:1.13',
         'pull': 'always',
         'commands': [
-          'make build',
+          'make protobuf build',
         ],
         'volumes': [
           {
diff --git a/Makefile b/Makefile
index a6115397..52dfc83c 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 install github.com/golang/protobuf/protoc-gen-go
+	GO111MODULE=off go get -v github.com/golang/protobuf/protoc-gen-go
 
 $(GOPATH)/bin/protoc-gen-micro:
-	GO111MODULE=on go install github.com/micro/protoc-gen-micro/v2
+	GO111MODULE=on go get -v github.com/micro/protoc-gen-micro/v2
 
 $(GOPATH)/bin/protoc-gen-microweb:
-	GO111MODULE=off go install github.com/owncloud/protoc-gen-microweb
+	GO111MODULE=off go get -v github.com/owncloud/protoc-gen-microweb
 
 $(GOPATH)/bin/protoc-gen-swagger:
-	GO111MODULE=off go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
+	GO111MODULE=off go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
 
 $(PROTO_SRC)/settings.pb.go: $(PROTO_SRC)/settings.proto
 	protoc \