summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 88e08c1e70..e3c948e33e 100644
--- a/Makefile
+++ b/Makefile
@@ -231,13 +231,11 @@ clean:
.PHONY: fmt
fmt:
- @echo "Running gitea-fmt(with gofmt)..."
- @$(GO) run build/code-batch-process.go gitea-fmt -s -w '{file-list}'
- @echo "Running gofumpt"
@hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
$(GO) install mvdan.cc/gofumpt@latest; \
fi
- @gofumpt -w -l -extra -lang 1.16 .
+ @echo "Running gitea-fmt (with gofumpt)..."
+ @$(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
.PHONY: vet
vet:
@@ -285,8 +283,11 @@ errcheck:
.PHONY: fmt-check
fmt-check:
+ @hash gofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+ $(GO) install mvdan.cc/gofumpt@latest; \
+ fi
# get all go files and run gitea-fmt (with gofmt) on them
- @diff=$$($(GO) run build/code-batch-process.go gitea-fmt -s -d '{file-list}'); \
+ @diff=$$($(GO) run build/code-batch-process.go gitea-fmt -l '{file-list}'); \
if [ -n "$$diff" ]; then \
echo "Please run 'make fmt' and commit the result:"; \
echo "$${diff}"; \