Skip to content

Commit cd7e060

Browse files
authored
Merge pull request #476 from kubernetes/dependabot/github_actions/golangci/golangci-lint-action-6.5.0
build(deps): bump golangci/golangci-lint-action from 6.4.1 to 6.5.0
2 parents f195e01 + 7518017 commit cd7e060

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
go-version: '1.22'
1818
check-latest: true
1919
- name: golangci-lint
20-
uses: golangci/golangci-lint-action@818ec4d51a1feacefc42ff1b3ec25d4962690f39 # v6.4.1
20+
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
2121
with:
22-
version: v1.61
22+
version: v1.64

.golangci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
run:
33
concurrency: 6
4-
deadline: 5m
4+
timeout: 5m
55
issues:
66
exclude-rules:
77
# counterfeiter fakes are usually named 'fake_<something>.go'
@@ -37,9 +37,7 @@ linters:
3737
- errchkjson
3838
- errname
3939
- errorlint
40-
- execinquery
4140
- exhaustive
42-
- exportloopref
4341
- forcetypeassert
4442
- gci
4543
- ginkgolinter
@@ -241,9 +239,6 @@ linters-settings:
241239
nolintlint:
242240
# Enable to ensure that nolint directives are all used. Default is true.
243241
allow-unused: false
244-
# Disable to ensure that nolint directives don't have a leading space. Default is true.
245-
# TODO(lint): Enforce machine-readable `nolint` directives
246-
allow-leading-space: true
247242
# Exclude following linters from requiring an explanation. Default is [].
248243
allow-no-explanation: []
249244
# Enable to require an explanation of nonzero length after each nolint directive. Default is false.

0 commit comments

Comments
 (0)