From 7fd153b4f9e929a21e1f926e7d080ceb29bcdf06 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 31 May 2022 00:05:22 +0200
Subject: [PATCH 1/2] make makefile great again

---
 Makefile | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 4509f5f..7d5b47f 100644
--- a/Makefile
+++ b/Makefile
@@ -67,23 +67,23 @@ vet:
 	cd gitea && $(GO) vet -vettool=gitea-vet $(PACKAGE)
 
 .PHONY: ci-lint
-ci-lint:
-	cd gitea/; \
-	$(GO) run github.com/mgechev/revive@latest -config ../.revive.toml .; \
+ci-lint: tool-golangci tool-gofumpt tool-revive
+	@cd gitea/; echo -n "revive ..."; \
+	revive -config ../.revive.toml .; \
 	if [ $$? -eq 1 ]; then \
-		echo "Doesn't pass revive"; \
+		echo; echo "Doesn't pass revive"; \
 		exit 1; \
-	fi; \
-	diff=$$($(GO) run mvdan.cc/gofumpt@latest -extra -l .); \
+	fi; echo " done"; echo -n "gofumpt ...";\
+	diff=$$(gofumpt -extra -l .); \
 	if [ -n "$$diff" ]; then \
-		echo "Not gofumpt-ed"; \
+		echo; echo "Not gofumpt-ed"; \
 		exit 1; \
-	fi; \
-	$(GO) run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.2 run --timeout 5m; \
+	fi; echo " done"; echo -n "golangci-lint ...";\
+	golangci-lint run --timeout 5m; \
 	if [ $$? -eq 1 ]; then \
-		echo "Doesn't pass golangci-lint"; \
+		echo; echo "Doesn't pass golangci-lint"; \
 		exit 1; \
-	fi; \
+	fi; echo " done"; \
 	cd -; \
 
 .PHONY: test
@@ -121,3 +121,18 @@ bench:
 .PHONY: build
 build:
 	cd gitea && $(GO) build
+
+tool-golangci:
+	@hash golangci-lint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+	$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@latest; \
+	fi
+
+tool-gofumpt:
+	@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+	$(GO) install mvdan.cc/gofumpt@latest; \
+	fi
+
+tool-revive:
+	@hash revive > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+	$(GO) install github.com/mgechev/revive@latest; \
+	fi
-- 
2.40.1


From 9e014a7b0ecc17a228dc6f1475e4d93ffb714368 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 31 May 2022 00:06:59 +0200
Subject: [PATCH 2/2] update deps

---
 gitea/go.mod | 2 +-
 gitea/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitea/go.mod b/gitea/go.mod
index bc7f600..ff97ac4 100644
--- a/gitea/go.mod
+++ b/gitea/go.mod
@@ -3,6 +3,6 @@ module code.gitea.io/sdk/gitea
 go 1.13
 
 require (
-	github.com/hashicorp/go-version v1.4.0
+	github.com/hashicorp/go-version v1.5.0
 	github.com/stretchr/testify v1.7.0
 )
diff --git a/gitea/go.sum b/gitea/go.sum
index ebae1e4..8279996 100644
--- a/gitea/go.sum
+++ b/gitea/go.sum
@@ -1,7 +1,7 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/hashicorp/go-version v1.4.0 h1:aAQzgqIrRKRa7w75CKpbBxYsmUoPjzVm1W59ca1L0J4=
-github.com/hashicorp/go-version v1.4.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/hashicorp/go-version v1.5.0 h1:O293SZ2Eg+AAYijkVK3jR786Am1bhDEh2GHT0tIVE5E=
+github.com/hashicorp/go-version v1.5.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-- 
2.40.1