diff --git a/.golangci.yml b/.golangci.yml index 9f7a1a94..d6c0fcbb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,14 +1,13 @@ linters-settings: govet: check-shadowing: true - # Disabled due to error on go - # settings: - # printf: - # funcs: - # - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof - # - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf - # - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf - # - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf + settings: + printf: + funcs: + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf + - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf golint: min-confidence: 0 gocyclo: diff --git a/make/common.mk b/make/common.mk index 9d8899ff..93e03600 100644 --- a/make/common.mk +++ b/make/common.mk @@ -15,7 +15,7 @@ OUTPUT_ROOT=output/ ######################################### bootstra%: - $Q GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.22.2 + $Q curl -sSfL https://raw.githubusercontent.com/smallstep/cli/master/make/golangci-install.sh | sh -s -- -b $(go env GOPATH)/bin v1.22.2 .PHONY: bootstra%