Skip to content

Commit 61d2e8a

Browse files
Merge pull request #6609 from thaJeztah/28.x_backport_bump_golangci_lint
[28.x backport] Dockerfile: update golangci-lint to v2.5.0
2 parents 6abcd4a + fbf5c8a commit 61d2e8a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
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,nakedret,unused // ignore linting errors, so that we can stick close to upstream
15+
//nolint:gocyclo,gofumpt,nakedret,unused // ignore linting errors, so that we can stick close to upstream
1616
package tabwriter
1717

1818
import (

dockerfiles/Dockerfile.lint

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ ARG GO_VERSION=1.24.8
66
# It must be a supported tag in the docker.io/library/alpine image repository
77
# that's also available as alpine image variant for the Golang version used.
88
ARG ALPINE_VERSION=3.21
9-
ARG GOLANGCI_LINT_VERSION=v2.1.5
9+
# GOLANGCI_LINT_VERSION sets the version of the golangci/golangci-lint image to use.
10+
ARG GOLANGCI_LINT_VERSION=v2.5.0
1011

1112
FROM golangci/golangci-lint:${GOLANGCI_LINT_VERSION}-alpine AS golangci-lint
1213

0 commit comments

Comments
 (0)