Skip to content

Commit 2fe3be7

Browse files
committed
fix: golangci-lint working again
1 parent 79ef879 commit 2fe3be7

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/run-tests.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: checkout
15-
uses: actions/checkout@v3
16-
- name: setup-go
17-
uses: actions/setup-go@v3
18-
with:
19-
go-version: '1.20'
15+
uses: actions/checkout@v4
2016
- name: golangci-lint
21-
uses: golangci/golangci-lint-action@v2
17+
uses: golangci/golangci-lint-action@v6
2218
with:
23-
version: v1.58.1
19+
version: v1.61.0
2420
run-unit-tests:
2521
concurrency:
2622
group: run-unit-tests-${{ github.head_ref || github.ref_name }}

.golangci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ linters-settings:
5656
check-blank: false
5757
govet:
5858
# report about shadowed variables
59-
check-shadowing: true
59+
shadow: true
6060
fieldalignment: true
6161
golint:
6262
# minimal confidence for issues, default is 0.8
@@ -76,6 +76,7 @@ linters-settings:
7676
gosec:
7777
excludes:
7878
- G101
79+
- G115
7980
fieldalignment:
8081
# print struct with more effective memory layout or not, false by default
8182
suggest-new: true
@@ -129,6 +130,8 @@ linters-settings:
129130
linters:
130131
disable-all: true
131132
enable:
133+
# - cyclop
134+
# - depguardgolang
132135
- dogsled
133136
- errcheck
134137
- errorlint

internal/exec/exec.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func InPod(
5858
if err != nil {
5959
return stdout.String(), stderr.String(), errors.Wrapf(
6060
err,
61+
//nolint:govet // TODO @jorres figure out why non-const error messages are not recommended
6162
fmt.Sprintf("failed to stream execution results back, stdout:\n\"%s\"stderr:\n\"%s\"", stdout.String(), stderr.String()),
6263
)
6364
}

0 commit comments

Comments
 (0)