From dbf6ff94fd1a9164eefdca177cc53a21a10b5f13 Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Thu, 30 Jun 2022 17:21:14 +0530 Subject: [PATCH 1/2] Drop GOPRIVATE from Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0e17b10..0eda290 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ .PHONY: tidy tidy: - GOPRIVATE=github.com/paralus/* go mod tidy + go mod tidy .PHONY: vendor vendor: go mod vendor From fd37d9aa9e37d3de59791730036223c9208e7762 Mon Sep 17 00:00:00 2001 From: Abin Simon Date: Thu, 30 Jun 2022 17:23:32 +0530 Subject: [PATCH 2/2] Simplify proto generation and clean --- .gitignore | 1 + Makefile | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2d83068..70400c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ coverage.out +paralus diff --git a/Makefile b/Makefile index 0eda290..1543afc 100644 --- a/Makefile +++ b/Makefile @@ -11,12 +11,14 @@ build: # size of binary. go build -ldflags "-s" -o paralus . -.PHONY: build-proto -build-proto: - buf build +.PHONY: clean-proto +clean-proto: + rm -rf ./gen + find . -name "*.pb*" -type f -delete -.PHONY: gen-proto -gen-proto: +.PHONY: build-proto +build-proto: clean-proto + buf build buf generate .PHONY: test @@ -31,5 +33,4 @@ check: .PHONY: clean clean: - rm -rf ./**/gen - find . -name "*.pb*" -type f -delete + rm paralus