From 36d297091ef4a32da03fd59e451ffc8873df4ccc Mon Sep 17 00:00:00 2001 From: zachaller Date: Fri, 21 Oct 2022 13:59:15 -0500 Subject: [PATCH 1/2] build: copy proto files from GOPATH so we can clone outside of GOPATH Signed-off-by: zachaller --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 1dd075d9e3..3700027b5c 100644 --- a/Makefile +++ b/Makefile @@ -111,6 +111,8 @@ k8s-proto: go-mod-vendor $(TYPES) --proto-import $(CURDIR)/vendor \ --proto-import=${DIST_DIR}/protoc-include touch pkg/apis/rollouts/v1alpha1/generated.proto + cp -R ${GOPATH}/src/github.com/argoproj/argo-rollouts/pkg . + # generates *.pb.go, *.pb.gw.go, swagger from .proto files .PHONY: api-proto From 1bc94e24000a5892977d2541291f60fdf58abe35 Mon Sep 17 00:00:00 2001 From: zachaller Date: Fri, 21 Oct 2022 14:17:35 -0500 Subject: [PATCH 2/2] always return true so that we can run within GOPATH as well Signed-off-by: zachaller --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3700027b5c..e04235a207 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ k8s-proto: go-mod-vendor $(TYPES) --proto-import $(CURDIR)/vendor \ --proto-import=${DIST_DIR}/protoc-include touch pkg/apis/rollouts/v1alpha1/generated.proto - cp -R ${GOPATH}/src/github.com/argoproj/argo-rollouts/pkg . + cp -R ${GOPATH}/src/github.com/argoproj/argo-rollouts/pkg . | true # generates *.pb.go, *.pb.gw.go, swagger from .proto files