From 6f40bc91beee75e5f97a68f135919a127919a851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Tue, 24 Aug 2021 17:23:31 +0300 Subject: [PATCH] simplify linter --- .build.yml | 1 - Makefile | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.build.yml b/.build.yml index 8f65a03..bdfcb87 100644 --- a/.build.yml +++ b/.build.yml @@ -13,7 +13,6 @@ tasks: make -C undocker coverage.html - lint: | make -C undocker -O -j$(nproc) lint - shellcheck undocker/release - binaries: | make -C undocker -O -j$(nproc) sha256sum.txt cat undocker/sha256sum.txt diff --git a/Makefile b/Makefile index 9ffd727..89e2120 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +SCRIPTS = $(shell awk '/#!\/bin\/(ba)?sh/&&FNR==1{print FILENAME}' $(shell git ls-files)) GODEPS = $(shell git ls-files '*.go' go.mod go.sum) GOBIN = $(shell go env GOPATH)/bin/ @@ -29,15 +30,10 @@ $(foreach goosarch,$(GOOSARCHS),\ all: $(UNDOCKERS) .PHONY: lint -lint: vet staticcheck - -.PHONY: vet -vet: +lint: go vet ./... - -.PHONY: staticcheck -staticcheck: $(GOBIN)staticcheck -f stylish ./... + shellcheck $(SCRIPTS) .INTERMEDIATE: coverage.out coverage.out: $(GODEPS)