From 30d8f8dd213b86bd34c501d7820a33fd441cc267 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Sun, 26 Feb 2023 21:37:57 +0100 Subject: lint: always run golangci-lint@latest Do not store the dependency in tools.go as there may be conflicts with some indirect dependencies of aerc. Run gofumpt and golangci-lint from their latest tagged release. This should fix issues with go 1.20. Bonus, it drains a bit of fat from go.sum. Signed-off-by: Robin Jarry Acked-by: Moritz Poldrack --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cfcd0fe3..965d6596 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ dev: .PHONY: fmt fmt: - $(GO) run mvdan.cc/gofumpt -w . + $(GO) run mvdan.cc/gofumpt@latest -w . linters.so: contrib/linters.go $(GO) build -buildmode=plugin -o linters.so contrib/linters.go @@ -79,10 +79,10 @@ linters.so: contrib/linters.go lint: linters.so @contrib/check-whitespace `git ls-files ':!:filters/vectors'` && \ echo white space ok. - @$(GO) run mvdan.cc/gofumpt -d . | grep ^ \ + @$(GO) run mvdan.cc/gofumpt@latest -d . | grep ^ \ && echo The above files need to be formatted, please run make fmt && exit 1 \ || echo all files formatted. - $(GO) run github.com/golangci/golangci-lint/cmd/golangci-lint run + $(GO) run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run .PHONY: vulncheck vulncheck: -- cgit