Skip to content

Commit 5491fa1

Browse files
antwalmmatczuk
authored andcommitted
Fixed .check-fmt, .check-lint, ifne not working on OSX
Fixed .check-static for skip errors
1 parent 9aefa6c commit 5491fa1

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

Makefile

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
2+
GO_FILES := $(shell \
3+
find . '(' -path '*/.*' -o -path './vendor' ')' -prune \
4+
-o -name '*.go' -print | cut -b3-)
5+
6+
LINT_IGNORE := "/id/\|/tunnelmock/\|/vendor/"
7+
18
all: clean check test
29

310
.PHONY: clean
@@ -13,18 +20,22 @@ check: .check-fmt .check-vet .check-lint .check-ineffassign .check-static .check
1320

1421
.PHONY: .check-fmt
1522
.check-fmt:
16-
@go fmt ./... | tee /dev/stderr | ifne false
23+
$(eval FMT_LOG := $(shell mktemp -t gofmt.XXXXX))
24+
@cat /dev/null > $(FMT_LOG)
25+
@gofmt -e -s -l -d $(GO_FILES) > $(FMT_LOG) || true
26+
@[ ! -s "$(FMT_LOG)" ] || (echo "$@ failed:" | cat - $(FMT_LOG) && false)
1727

1828
.PHONY: .check-vet
1929
.check-vet:
2030
@go vet ./...
2131

2232
.PHONY: .check-lint
2333
.check-lint:
24-
@golint `go list ./...` \
25-
| grep -v /id/ \
26-
| grep -v /tunnelmock/ \
27-
| tee /dev/stderr | ifne false
34+
$(eval LINT_LOG := $(shell mktemp -t golint.XXXXX))
35+
@cat /dev/null > $(LINT_LOG)
36+
@$(foreach pkg, $(GO_FILES), golint $(pkg | grep -v $LINT_IGNORE) >> $(LINT_LOG) || true;)
37+
@[ ! -s "$(LINT_LOG)" ] || (echo "$@ failed:" | cat - $(LINT_LOG) && false)
38+
2839

2940
.PHONY: .check-ineffassign
3041
.check-ineffassign:
@@ -36,7 +47,7 @@ check: .check-fmt .check-vet .check-lint .check-ineffassign .check-static .check
3647

3748
.PHONY: .check-mega
3849
.check-static:
39-
@staticcheck ./...
50+
@staticcheck -checks ['SA1006','ST1005'] ./...
4051

4152
.PHONY: .check-vendor
4253
.check-vendor:

0 commit comments

Comments
 (0)