diff --git a/.golangci.yml b/.golangci.yml index 4615a34c..f0c2eed0 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,13 +1,13 @@ linters-settings: govet: check-shadowing: true - # 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: @@ -66,6 +66,6 @@ issues: # golangci.com configuration # https://github.com/golangci/golangci/wiki/Configuration service: - golangci-lint-version: 1.22.x # use the fixed version to not introduce new linters unexpectedly + golangci-lint-version: 1.19.x # use the fixed version to not introduce new linters unexpectedly prepare: - echo "here I can run custom commands, but no preparation needed for this repo" diff --git a/Makefile b/Makefile index 750dbc5a..bd11222e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,8 @@ all: build test lint ######################################### bootstra%: - $Q GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.22.2 + # Using a released version of golangci-lint to take into account custom replacements in their go.mod + $Q curl -sSfL https://raw.githubusercontent.com/smallstep/cli/master/make/golangci-install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.19.1 .PHONY: bootstra%