Skip to content

Commit c0f2a1d

Browse files
rootulpclaude
rootulp
and
claude
authored
fix: pin golangci-lint version via Go tool dependency (#2799)
## Summary - Pin golangci-lint v2.9.0 as a Go tool dependency in `go.mod` so that CI and local `make lint` use the exact same version - Replace `golangci-lint-action` in CI with `go tool golangci-lint run`, since Go handles download and caching via the module cache - Update Makefile `lint` target to use `go tool golangci-lint run` - Remove unused `//nolint:prealloc` directive in `mempool/cache_test.go` (prealloc v1.0.2 no longer flags nested loops dependent on outer loop vars) Closes #2793 ## Test plan - [ ] Verify `make lint` passes locally - [ ] Verify CI lint job passes - [ ] Verify `go tool golangci-lint version` reports v2.9.0 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 047e0ca commit c0f2a1d

File tree

5 files changed

+646
-35
lines changed

5 files changed

+646
-35
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,5 @@ jobs:
3131
**/**.go
3232
go.mod
3333
go.sum
34-
- uses: golangci/golangci-lint-action@v9
35-
with:
36-
version: latest
37-
args: --timeout 10m
38-
github-token: ${{ secrets.github_token }}
34+
- run: go tool golangci-lint run --timeout 10m
3935
if: env.GIT_DIFF

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ format:
252252
find . -name '*.go' -type f -not -path "*.git*" -not -name '*.pb.go' -not -name '*pb_test.go' | xargs goimports -w -local github.com/cometbft/cometbft
253253
.PHONY: format
254254

255-
#? lint: Run latest golangci-lint linter
255+
#? lint: Run golangci-lint linter (version pinned in go.mod)
256256
lint:
257257
@echo "--> Running golangci-lint"
258-
@golangci-lint run
258+
@go tool golangci-lint run
259259
.PHONY: lint
260260

261261
# https://github.com/cometbft/cometbft/pull/1925#issuecomment-1875127862

‎go.mod‎

Lines changed: 175 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ require (
4343
github.com/rs/cors v1.11.1
4444
github.com/sasha-s/go-deadlock v0.3.6
4545
github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
46-
github.com/spf13/cobra v1.10.1
46+
github.com/spf13/cobra v1.10.2
4747
github.com/spf13/viper v1.21.0
4848
github.com/stretchr/testify v1.11.1
4949
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
5050
go.opentelemetry.io/otel v1.40.0
5151
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.40.0
5252
go.opentelemetry.io/otel/sdk v1.40.0
53-
golang.org/x/crypto v0.47.0
54-
golang.org/x/net v0.49.0
53+
golang.org/x/crypto v0.48.0
54+
golang.org/x/net v0.50.0
5555
golang.org/x/sync v0.19.0
5656
gonum.org/v1/gonum v0.17.0
5757
google.golang.org/grpc v1.78.0
@@ -65,12 +65,37 @@ require (
6565
)
6666

6767
require (
68+
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
69+
4d63.com/gochecknoglobals v0.2.2 // indirect
70+
codeberg.org/chavacava/garif v0.2.0 // indirect
71+
codeberg.org/polyfloyd/go-errorlint v1.9.0 // indirect
6872
dario.cat/mergo v1.0.0 // indirect
73+
dev.gaijin.team/go/exhaustruct/v4 v4.0.0 // indirect
74+
dev.gaijin.team/go/golib v0.6.0 // indirect
75+
github.com/4meepo/tagalign v1.4.3 // indirect
76+
github.com/Abirdcfly/dupword v0.1.7 // indirect
77+
github.com/AdminBenni/iota-mixing v1.0.0 // indirect
78+
github.com/AlwxSin/noinlineerr v1.0.5 // indirect
79+
github.com/Antonboom/errname v1.1.1 // indirect
80+
github.com/Antonboom/nilnil v1.1.1 // indirect
81+
github.com/Antonboom/testifylint v1.6.4 // indirect
6982
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7083
github.com/DataDog/zstd v1.4.5 // indirect
84+
github.com/Djarvur/go-err113 v0.1.1 // indirect
7185
github.com/Microsoft/go-winio v0.6.2 // indirect
86+
github.com/MirrexOne/unqueryvet v1.5.3 // indirect
7287
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
88+
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
7389
github.com/ProtonMail/go-crypto v1.1.6 // indirect
90+
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
91+
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
92+
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
93+
github.com/alexkohler/prealloc v1.0.2 // indirect
94+
github.com/alfatraining/structtag v1.0.0 // indirect
95+
github.com/alingse/asasalint v0.0.11 // indirect
96+
github.com/alingse/nilnesserr v0.2.0 // indirect
97+
github.com/ashanbrown/forbidigo/v2 v2.3.0 // indirect
98+
github.com/ashanbrown/makezero/v2 v2.1.0 // indirect
7499
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
75100
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
76101
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 // indirect
@@ -86,8 +111,26 @@ require (
86111
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 // indirect
87112
github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 // indirect
88113
github.com/aws/smithy-go v1.24.0 // indirect
114+
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
89115
github.com/beorn7/perks v1.0.1 // indirect
116+
github.com/bkielbasa/cyclop v1.2.3 // indirect
117+
github.com/blizzy78/varnamelen v0.8.0 // indirect
118+
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
119+
github.com/bombsimon/wsl/v5 v5.6.0 // indirect
120+
github.com/breml/bidichk v0.3.3 // indirect
121+
github.com/breml/errchkjson v0.4.1 // indirect
122+
github.com/butuzov/ireturn v0.4.0 // indirect
123+
github.com/butuzov/mirror v1.3.0 // indirect
124+
github.com/catenacyber/perfsprint v0.10.1 // indirect
125+
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
90126
github.com/cespare/xxhash/v2 v2.3.0 // indirect
127+
github.com/charithe/durationcheck v0.0.11 // indirect
128+
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
129+
github.com/charmbracelet/lipgloss v1.1.0 // indirect
130+
github.com/charmbracelet/x/ansi v0.10.1 // indirect
131+
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
132+
github.com/charmbracelet/x/term v0.2.1 // indirect
133+
github.com/ckaznocha/intrange v0.3.1 // indirect
91134
github.com/cloudflare/circl v1.6.1 // indirect
92135
github.com/cockroachdb/errors v1.11.3 // indirect
93136
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
@@ -96,41 +139,118 @@ require (
96139
github.com/cockroachdb/redact v1.1.5 // indirect
97140
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
98141
github.com/containerd/continuity v0.3.0 // indirect
142+
github.com/curioswitch/go-reassign v0.3.0 // indirect
99143
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
144+
github.com/daixiang0/gci v0.13.7 // indirect
145+
github.com/dave/dst v0.27.3 // indirect
100146
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
147+
github.com/denis-tingaikin/go-header v0.5.0 // indirect
101148
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
102149
github.com/dgraph-io/ristretto v0.1.1 // indirect
150+
github.com/dlclark/regexp2 v1.11.5 // indirect
103151
github.com/docker/cli v24.0.7+incompatible // indirect
104152
github.com/docker/go-connections v0.4.0 // indirect
105153
github.com/docker/go-units v0.5.0 // indirect
106154
github.com/dustin/go-humanize v1.0.1 // indirect
107155
github.com/emirpasic/gods v1.18.1 // indirect
156+
github.com/ettle/strcase v0.2.0 // indirect
157+
github.com/fatih/color v1.18.0 // indirect
158+
github.com/fatih/structtag v1.2.0 // indirect
159+
github.com/firefart/nonamedreturns v1.0.6 // indirect
108160
github.com/fsnotify/fsnotify v1.9.0 // indirect
161+
github.com/fzipp/gocyclo v0.6.0 // indirect
109162
github.com/getsentry/sentry-go v0.27.0 // indirect
163+
github.com/ghostiam/protogetter v0.3.20 // indirect
164+
github.com/go-critic/go-critic v0.14.3 // indirect
110165
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
111166
github.com/go-git/go-billy/v5 v5.6.2 // indirect
112167
github.com/go-logr/logr v1.4.3 // indirect
113168
github.com/go-logr/stdr v1.2.2 // indirect
114-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
169+
github.com/go-toolsmith/astcast v1.1.0 // indirect
170+
github.com/go-toolsmith/astcopy v1.1.0 // indirect
171+
github.com/go-toolsmith/astequal v1.2.0 // indirect
172+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
173+
github.com/go-toolsmith/astp v1.1.0 // indirect
174+
github.com/go-toolsmith/strparse v1.1.0 // indirect
175+
github.com/go-toolsmith/typep v1.1.0 // indirect
176+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
177+
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
178+
github.com/gobwas/glob v0.2.3 // indirect
179+
github.com/godoc-lint/godoc-lint v0.11.1 // indirect
180+
github.com/gofrs/flock v0.13.0 // indirect
115181
github.com/golang/glog v1.2.5 // indirect
116182
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
183+
github.com/golangci/asciicheck v0.5.0 // indirect
184+
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
185+
github.com/golangci/go-printf-func-name v0.1.1 // indirect
186+
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
187+
github.com/golangci/golangci-lint/v2 v2.9.0 // indirect
188+
github.com/golangci/golines v0.15.0 // indirect
189+
github.com/golangci/misspell v0.8.0 // indirect
190+
github.com/golangci/plugin-module-register v0.1.2 // indirect
191+
github.com/golangci/revgrep v0.8.0 // indirect
192+
github.com/golangci/swaggoswag v0.0.0-20250504205917-77f2aca3143e // indirect
193+
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
117194
github.com/google/btree v1.1.3 // indirect
118195
github.com/google/flatbuffers v1.12.1 // indirect
119196
github.com/google/go-cmp v0.7.0 // indirect
197+
github.com/gordonklaus/ineffassign v0.2.0 // indirect
198+
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
199+
github.com/gostaticanalysis/comment v1.5.0 // indirect
200+
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
201+
github.com/gostaticanalysis/nilerr v0.1.2 // indirect
120202
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
121203
github.com/grafana/pyroscope-go/godeltaprof v0.1.9 // indirect
204+
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
205+
github.com/hashicorp/go-version v1.8.0 // indirect
206+
github.com/hexops/gotextdiff v1.0.3 // indirect
122207
github.com/inconshreveable/mousetrap v1.1.0 // indirect
123208
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
209+
github.com/jgautheron/goconst v1.8.2 // indirect
210+
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
211+
github.com/jjti/go-spancheck v0.6.5 // indirect
124212
github.com/jmhodges/levigo v1.0.0 // indirect
213+
github.com/julz/importas v0.2.0 // indirect
214+
github.com/karamaru-alpha/copyloopvar v1.2.2 // indirect
125215
github.com/kevinburke/ssh_config v1.2.0 // indirect
216+
github.com/kisielk/errcheck v1.9.0 // indirect
217+
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
126218
github.com/klauspost/compress v1.18.0 // indirect
127219
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
128220
github.com/kr/pretty v0.3.1 // indirect
129221
github.com/kr/text v0.2.0 // indirect
222+
github.com/kulti/thelper v0.7.1 // indirect
223+
github.com/kunwardeep/paralleltest v1.0.15 // indirect
224+
github.com/lasiar/canonicalheader v1.1.2 // indirect
225+
github.com/ldez/exptostd v0.4.5 // indirect
226+
github.com/ldez/gomoddirectives v0.8.0 // indirect
227+
github.com/ldez/grignotin v0.10.1 // indirect
228+
github.com/ldez/structtags v0.6.1 // indirect
229+
github.com/ldez/tagliatelle v0.7.2 // indirect
230+
github.com/ldez/usetesting v0.5.0 // indirect
231+
github.com/leonklingele/grouper v1.1.2 // indirect
130232
github.com/linxGnu/grocksdb v1.8.14 // indirect
233+
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
234+
github.com/macabu/inamedparam v0.2.0 // indirect
235+
github.com/manuelarte/embeddedstructfieldcheck v0.4.0 // indirect
236+
github.com/manuelarte/funcorder v0.5.0 // indirect
237+
github.com/maratori/testableexamples v1.0.1 // indirect
238+
github.com/maratori/testpackage v1.1.2 // indirect
239+
github.com/matoous/godox v1.1.0 // indirect
240+
github.com/mattn/go-colorable v0.1.14 // indirect
241+
github.com/mattn/go-isatty v0.0.20 // indirect
242+
github.com/mattn/go-runewidth v0.0.16 // indirect
243+
github.com/mgechev/revive v1.14.0 // indirect
244+
github.com/mitchellh/go-homedir v1.1.0 // indirect
131245
github.com/moby/sys/user v0.3.0 // indirect
132246
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
247+
github.com/moricho/tparallel v0.3.2 // indirect
248+
github.com/muesli/termenv v0.16.0 // indirect
133249
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
250+
github.com/nakabonne/nestif v0.3.1 // indirect
251+
github.com/nishanths/exhaustive v0.12.0 // indirect
252+
github.com/nishanths/predeclared v0.2.2 // indirect
253+
github.com/nunnatsa/ginkgolinter v0.22.0 // indirect
134254
github.com/opencontainers/go-digest v1.0.0 // indirect
135255
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
136256
github.com/opencontainers/runc v1.2.8 // indirect
@@ -139,33 +259,79 @@ require (
139259
github.com/pjbgf/sha1cd v0.3.2 // indirect
140260
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
141261
github.com/prometheus/procfs v0.16.1 // indirect
262+
github.com/quasilyte/go-ruleguard v0.4.5 // indirect
263+
github.com/quasilyte/go-ruleguard/dsl v0.3.23 // indirect
264+
github.com/quasilyte/gogrep v0.5.0 // indirect
265+
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
266+
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
267+
github.com/raeperd/recvcheck v0.2.0 // indirect
268+
github.com/rivo/uniseg v0.4.7 // indirect
142269
github.com/rogpeppe/go-internal v1.14.1 // indirect
270+
github.com/ryancurrah/gomodguard v1.4.1 // indirect
271+
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
143272
github.com/sagikazarmark/locafero v0.11.0 // indirect
273+
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
274+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
275+
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
276+
github.com/sashamelentyev/usestdlibvars v1.29.0 // indirect
144277
github.com/satori/go.uuid v1.2.0 // indirect
278+
github.com/securego/gosec/v2 v2.22.11 // indirect
145279
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
146-
github.com/sirupsen/logrus v1.9.3 // indirect
280+
github.com/sirupsen/logrus v1.9.4 // indirect
281+
github.com/sivchari/containedctx v1.0.3 // indirect
147282
github.com/skeema/knownhosts v1.3.1 // indirect
283+
github.com/sonatard/noctx v0.4.0 // indirect
148284
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
285+
github.com/sourcegraph/go-diff v0.7.0 // indirect
149286
github.com/spf13/afero v1.15.0 // indirect
150287
github.com/spf13/cast v1.10.0 // indirect
151288
github.com/spf13/pflag v1.0.10 // indirect
289+
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
290+
github.com/stbenjam/no-sprintf-host-port v0.3.1 // indirect
152291
github.com/stretchr/objx v0.5.2 // indirect
153292
github.com/subosito/gotenv v1.6.0 // indirect
293+
github.com/tetafro/godot v1.5.4 // indirect
294+
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
295+
github.com/timonwong/loggercheck v0.11.0 // indirect
296+
github.com/tomarrell/wrapcheck/v2 v2.12.0 // indirect
297+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
298+
github.com/ultraware/funlen v0.2.0 // indirect
299+
github.com/ultraware/whitespace v0.2.0 // indirect
300+
github.com/uudashr/gocognit v1.2.0 // indirect
301+
github.com/uudashr/iface v1.4.1 // indirect
154302
github.com/xanzy/ssh-agent v0.3.3 // indirect
303+
github.com/xen0n/gosmopolitan v1.3.0 // indirect
304+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
305+
github.com/yagipy/maintidx v1.0.0 // indirect
306+
github.com/yeya24/promlinter v0.3.0 // indirect
307+
github.com/ykadowak/zerologlint v0.1.5 // indirect
308+
gitlab.com/bosi/decorder v0.4.2 // indirect
309+
go-simpler.org/musttag v0.14.0 // indirect
310+
go-simpler.org/sloglint v0.11.1 // indirect
311+
go.augendre.info/arangolint v0.4.0 // indirect
312+
go.augendre.info/fatcontext v0.9.0 // indirect
155313
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
156314
go.opencensus.io v0.24.0 // indirect
157315
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
158316
go.opentelemetry.io/otel/metric v1.40.0 // indirect
159317
go.opentelemetry.io/otel/trace v1.40.0 // indirect
318+
go.uber.org/multierr v1.10.0 // indirect
319+
go.uber.org/zap v1.27.0 // indirect
160320
go.yaml.in/yaml/v2 v2.4.3 // indirect
161321
go.yaml.in/yaml/v3 v3.0.4 // indirect
162322
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
163-
golang.org/x/sys v0.40.0 // indirect
164-
golang.org/x/text v0.33.0 // indirect
323+
golang.org/x/exp/typeparams v0.0.0-20251125195548-87e1e737ad39 // indirect
324+
golang.org/x/mod v0.33.0 // indirect
325+
golang.org/x/sys v0.41.0 // indirect
326+
golang.org/x/text v0.34.0 // indirect
327+
golang.org/x/tools v0.42.0 // indirect
165328
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
166329
gopkg.in/warnings.v0 v0.1.2 // indirect
167330
gopkg.in/yaml.v3 v3.0.1 // indirect
168331
gotest.tools v2.2.0+incompatible // indirect
332+
honnef.co/go/tools v0.6.1 // indirect
333+
mvdan.cc/gofumpt v0.9.2 // indirect
334+
mvdan.cc/unparam v0.0.0-20251027182757-5beb8c8f8f15 // indirect
169335
)
170336

171337
retract (
@@ -178,3 +344,5 @@ retract (
178344
// superseeded by v0.38.3 because of ASA-2024-001
179345
[v0.38.0, v0.38.2]
180346
)
347+
348+
tool github.com/golangci/golangci-lint/v2/cmd/golangci-lint

0 commit comments

Comments
 (0)