From 868574a686063c9c44637c9c4b198a60bc0ab6de Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Sun, 21 Feb 2021 02:53:25 +0100 Subject: [PATCH] add exclude-rules to be compatible with the previous golanci-lint version. --- .golangci.yml | 12 ++++++++++++ pkg/golinters/depguard.go | 2 +- pkg/golinters/goanalysis/adapters.go | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 08460ba96136..f2fcc17cc0fa 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -139,6 +139,18 @@ issues: - path: pkg/golinters/scopelint.go text: 'directive `//nolint:interfacer` is unused for linter interfacer' + # TODO temporary rule, must be removed + # related to https://github.com/golangci/golangci-lint/pull/1756 + # must be replaced by '//nolint:staticcheck // require changes in github.com/OpenPeeDeeP/depguard' + - path: pkg/golinters/depguard.go + text: 'SA1019: package golang.org/x/tools/go/loader is deprecated' + + # TODO temporary rule, must be removed + # related to https://github.com/golangci/golangci-lint/pull/1756 + # must be replaced by '///nolint:staticcheck // it's an adapter for golang.org/x/tools/go/packages' + - path: pkg/golinters/goanalysis/adapters.go + text: 'SA1019: package golang.org/x/tools/go/loader is deprecated' + run: skip-dirs: - test/testdata_etc diff --git a/pkg/golinters/depguard.go b/pkg/golinters/depguard.go index aa372e9568c0..3bd854811009 100644 --- a/pkg/golinters/depguard.go +++ b/pkg/golinters/depguard.go @@ -7,7 +7,7 @@ import ( "github.com/OpenPeeDeeP/depguard" "golang.org/x/tools/go/analysis" - "golang.org/x/tools/go/loader" //nolint:staticcheck // require changes in github.com/OpenPeeDeeP/depguard + "golang.org/x/tools/go/loader" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" "github.com/golangci/golangci-lint/pkg/lint/linter" diff --git a/pkg/golinters/goanalysis/adapters.go b/pkg/golinters/goanalysis/adapters.go index b702d1660bac..830c4d8822da 100644 --- a/pkg/golinters/goanalysis/adapters.go +++ b/pkg/golinters/goanalysis/adapters.go @@ -4,7 +4,7 @@ import ( "go/types" "golang.org/x/tools/go/analysis" - "golang.org/x/tools/go/loader" //nolint:staticcheck // it's an adapter for golang.org/x/tools/go/packages + "golang.org/x/tools/go/loader" ) func MakeFakeLoaderProgram(pass *analysis.Pass) *loader.Program {