Skip to content

Commit 113ec9c

Browse files
committed
chore: clean configuration
1 parent cb04c7b commit 113ec9c

File tree

3 files changed

+2
-28
lines changed

3 files changed

+2
-28
lines changed

.golangci.yml

-26
Original file line numberDiff line numberDiff line change
@@ -132,35 +132,9 @@ issues:
132132
- gocritic
133133
text: "unnecessaryDefer:"
134134

135-
# TODO temporary rule, must be removed
136-
# seems related to v0.34.1, but I was not able to reproduce locally,
137-
# I was also not able to reproduce in the CI of a fork,
138-
# only the golangci-lint CI seems to be affected by this invalid analysis.
139-
- path: pkg/golinters/scopelint.go
140-
text: 'directive `//nolint:interfacer` is unused for linter interfacer'
141-
142-
# TODO temporary rule, must be removed
143-
# related to https://github.com/golangci/golangci-lint/pull/1756
144-
# must be replaced by '//nolint:staticcheck // require changes in github.com/OpenPeeDeeP/depguard'
145-
- path: pkg/golinters/depguard.go
146-
text: 'SA1019: package golang.org/x/tools/go/loader is deprecated'
147-
148-
# TODO temporary rule, must be removed
149-
# related to https://github.com/golangci/golangci-lint/pull/1756
150-
# must be replaced by '///nolint:staticcheck // it's an adapter for golang.org/x/tools/go/packages'
151-
- path: pkg/golinters/goanalysis/adapters.go
152-
text: 'SA1019: package golang.org/x/tools/go/loader is deprecated'
153-
154135
run:
155136
skip-dirs:
156137
- test/testdata_etc
157138
- internal/cache
158139
- internal/renameio
159140
- internal/robustio
160-
161-
# golangci.com configuration
162-
# https://github.com/golangci/golangci/wiki/Configuration
163-
service:
164-
golangci-lint-version: 1.23.x # use the fixed version to not introduce new linters unexpectedly
165-
prepare:
166-
- echo "here I can run custom commands, but no preparation needed for this repo"

pkg/golinters/depguard.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"golang.org/x/tools/go/analysis"
1010
"golang.org/x/tools/go/loader"
1111

12-
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis"
12+
"github.com/golangci/golangci-lint/pkg/golinters/goanalysis" //nolint:staticcheck // require changes in github.com/OpenPeeDeeP/depguard
1313
"github.com/golangci/golangci-lint/pkg/lint/linter"
1414
"github.com/golangci/golangci-lint/pkg/result"
1515
)

pkg/golinters/goanalysis/adapters.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package goanalysis
33
import (
44
"go/types"
55

6-
"golang.org/x/tools/go/analysis"
6+
"golang.org/x/tools/go/analysis" //nolint:staticcheck // it's an adapter for golang.org/x/tools/go/packages
77
"golang.org/x/tools/go/loader"
88
)
99

0 commit comments

Comments
 (0)