Skip to content

Commit f872c9b

Browse files
committed
make+golangci: update linter
1 parent 15acfb2 commit f872c9b

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

.golangci.yml

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
# timeout for analysis
3-
deadline: 4m
3+
timeout: 4m
44
build-tags:
55
- autopilotrpc
66
- chainrpc
@@ -40,7 +40,7 @@ linters:
4040
enable-all: true
4141
disable:
4242
# Allow dynamic errors.
43-
- goerr113
43+
- err113
4444

4545
# We want to allow short variable names.
4646
- varnamelen
@@ -70,36 +70,34 @@ linters:
7070
# guidelines. See https://github.com/mvdan/gofumpt/issues/235.
7171
- gofumpt
7272

73-
# Disable gomnd even though we generally don't use magic numbers, but there
74-
# are exceptions where this improves readability.
75-
- gomnd
76-
7773
# Disable whitespace linter as it has conflict rules against our
7874
# contribution guidelines. See https://github.com/bombsimon/wsl/issues/109.
7975
#
8076
# TODO: bring it back when the above issue is fixed.
8177
- wsl
8278

8379
# Deprecated linters. See https://golangci-lint.run/usage/linters/.
84-
- interfacer
85-
- golint
86-
- maligned
87-
- scopelint
88-
- exhaustivestruct
8980
- bodyclose
9081
- contextcheck
9182
- nilerr
9283
- noctx
9384
- rowserrcheck
9485
- sqlclosecheck
95-
- structcheck
9686
- tparallel
9787
- unparam
9888
- wastedassign
99-
- ifshort
100-
- varcheck
101-
- deadcode
102-
- nosnakecase
89+
90+
# New linters that need a code adjustment first.
91+
- depguard
92+
- testifylint
93+
- intrange
94+
95+
# We use a replace directive for a custom protobuf library.
96+
- gomoddirectives
97+
98+
# The linter is too aggressive and doesn't add much value since reviewers
99+
# will also catch magic numbers that make sense to extract.
100+
- mnd
103101

104102
issues:
105103
# Only show newly introduced problems.

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GOACC_PKG := github.com/ory/go-acc
77
GO_BIN := ${GOPATH}/bin
88
LINT_BIN := $(GO_BIN)/golangci-lint
99

10-
LINT_COMMIT := v1.51.2
10+
LINT_COMMIT := v1.64.5
1111

1212
GOBUILD := go build -v
1313
GOINSTALL := go install -v

0 commit comments

Comments
 (0)