From bc863921697ed23d6a02135995700c119f2fd8c7 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Fri, 24 Jun 2022 21:46:51 +0200 Subject: [PATCH] mk: merge checkfmt into lint No need to have two separate targets. Signed-off-by: Robin Jarry --- .builds/alpine-edge.yml | 3 --- Makefile | 9 +++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.builds/alpine-edge.yml b/.builds/alpine-edge.yml index 92322b4..3893b98 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 129adaa..9792531 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