aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Jarry <robin@jarry.cc>2022-06-24 21:46:51 +0200
committerRobin Jarry <robin@jarry.cc>2022-06-24 21:46:51 +0200
commitbc863921697ed23d6a02135995700c119f2fd8c7 (patch)
tree82b28136af07792f33d97360952d5bd616b432ee
parent7bdfa928cbab7dbd82c51af43f8ec2b8e090e82a (diff)
downloadaerc-bc863921697ed23d6a02135995700c119f2fd8c7.tar.gz
mk: merge checkfmt into lint
No need to have two separate targets. Signed-off-by: Robin Jarry <robin@jarry.cc>
-rw-r--r--.builds/alpine-edge.yml3
-rw-r--r--Makefile9
2 files changed, 3 insertions, 9 deletions
diff --git a/.builds/alpine-edge.yml b/.builds/alpine-edge.yml
index 92322b44..3893b986 100644
--- a/.builds/alpine-edge.yml
+++ b/.builds/alpine-edge.yml
@@ -11,9 +11,6 @@ environment:
DESTDIR: ./out
GOFLAGS: "-tags=notmuch"
tasks:
- - checkfmt: |
- cd aerc
- make checkfmt
- lint: |
cd aerc
make lint
diff --git a/Makefile b/Makefile
index 129adaaa..9792531e 100644
--- a/Makefile
+++ b/Makefile
@@ -56,16 +56,13 @@ dev:
fmt:
gofmt -w .
-.PHONY: checkfmt
-checkfmt:
- @if [ `gofmt -l . | wc -l` -ne 0 ]; then \
+.PHONY: lint
+lint:
+ @echo "gofmt -d ."; if [ `gofmt -l . | wc -l` -ne 0 ]; then \
gofmt -d .; \
echo "ERROR: source files need reformatting with gofmt"; \
exit 1; \
fi
-
-.PHONY: lint
-lint:
$(GO) vet ./...
.PHONY: tests