Skip to content

Commit 30b0281

Browse files
authored
Merge pull request #6625 from thaJeztah/bump_golangci_lint
Dockerfile: update golangci-lint to v2.6.1
2 parents 9fc247e + 437ed4c commit 30b0281

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cli/command/formatter/tabwriter/tabwriter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// based on https://github.com/golang/go/blob/master/src/text/tabwriter/tabwriter.go Last modified 690ac40 on 31 Jan
1414

15-
//nolint:gocyclo,gofumpt,nakedret,unused // ignore linting errors, so that we can stick close to upstream
15+
//nolint:gocyclo,nakedret,unused // ignore linting errors, so that we can stick close to upstream
1616
package tabwriter
1717

1818
import (

cli/connhelper/ssh/ssh.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ func quoteCommand(commandAndArgs ...string) (string, error) {
175175
quotedCmd = a
176176
continue
177177
}
178-
quotedCmd += " " + a
178+
quotedCmd += " " + a //nolint:perfsprint // ignore "concat-loop"; no need to use a string-builder for this.
179179
}
180180
// each part is quoted appropriately, so now we'll have a full
181181
// shell command to pass off to "ssh"

dockerfiles/Dockerfile.lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG GO_VERSION=1.25.3
77
# that's also available as alpine image variant for the Golang version used.
88
ARG ALPINE_VERSION=3.22
99
# GOLANGCI_LINT_VERSION sets the version of the golangci/golangci-lint image to use.
10-
ARG GOLANGCI_LINT_VERSION=v2.5.0
10+
ARG GOLANGCI_LINT_VERSION=v2.6.1
1111

1212
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
1313

0 commit comments

Comments
 (0)