diff --git a/.golangci.yml b/.golangci.yml index 76bf32f580..9ea723082e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -53,10 +53,11 @@ linters-settings: local-prefixes: github.com/grafana/pyroscope/pkg,github.com/grafana/pyroscope/api,github.com/grafana/pyroscope/tools depguard: - list-type: blacklist - include-go-root: true - packages-with-error-message: - - github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log" + rules: + main: + deny: + - pkg: "github.com/go-kit/kit/log" + desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log" revive: rules: diff --git a/Makefile b/Makefile index 0bdffded69..362ab4250d 100644 --- a/Makefile +++ b/Makefile @@ -248,7 +248,7 @@ $(BIN)/buf: Makefile $(BIN)/golangci-lint: Makefile @mkdir -p $(@D) - GOBIN=$(abspath $(@D)) $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2 + GOBIN=$(abspath $(@D)) $(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.0 $(BIN)/protoc-gen-go: Makefile go.mod @mkdir -p $(@D)