summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2022-02-01 18:43:09 +0100
committerGitHub <noreply@github.com>2022-02-01 12:43:09 -0500
commit6f6b8491da0d98121c8cab5c48f95425efa9606d (patch)
tree12bcb8c729a140e1408621414170a771445f9683
parentbb5f859ec0f853383b85cb16b189fbacf7397551 (diff)
downloadgitea-6f6b8491da0d98121c8cab5c48f95425efa9606d.tar.gz
gitea-6f6b8491da0d98121c8cab5c48f95425efa9606d.zip
add gitea-fmt back (#18526)
-rw-r--r--Makefile7
-rw-r--r--modules/queue/queue_channel_test.go1
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 87613d9510..3c4a991fd2 100644
--- a/Makefile
+++ b/Makefile
@@ -231,10 +231,13 @@ clean:
.PHONY: fmt
fmt:
- @hash xgogofumpt > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
+ @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 .
+ @gofumpt -w -l -extra -lang 1.16 .
.PHONY: vet
vet:
diff --git a/modules/queue/queue_channel_test.go b/modules/queue/queue_channel_test.go
index f779ed5f8a..26a635b918 100644
--- a/modules/queue/queue_channel_test.go
+++ b/modules/queue/queue_channel_test.go
@@ -10,6 +10,7 @@ import (
"time"
"code.gitea.io/gitea/modules/log"
+
"github.com/stretchr/testify/assert"
)