Skip to content

Commit 24dee2b

Browse files
Update dependency golangci/golangci-lint to v2.5.0 (#3940)
* Update dependency golangci/golangci-lint to v2.5.0 | datasource | package | from | to | | ----------- | ---------------------- | ------ | ------ | | github-tags | golangci/golangci-lint | v2.4.0 | v2.5.0 | Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix lint errors --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Ciara Stacke <[email protected]>
1 parent 5188240 commit 24dee2b

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
5151
with:
5252
working-directory: ${{ matrix.directory }}
53-
version: v2.4.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
53+
version: v2.5.0 # renovate: datasource=github-tags depName=golangci/golangci-lint
5454

5555
njs-lint:
5656
name: NJS Lint

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ repos:
3939
- javascript
4040

4141
- repo: https://github.com/golangci/golangci-lint
42-
rev: v2.4.0
42+
rev: v2.5.0
4343
hooks:
4444
- id: golangci-lint-full
4545
name: golangci-lint-root

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
2323

2424
# tools versions
2525
# renovate: datasource=github-tags depName=golangci/golangci-lint
26-
GOLANGCI_LINT_VERSION = v2.4.0
26+
GOLANGCI_LINT_VERSION = v2.5.0
2727
# renovate: datasource=docker depName=kindest/node
2828
KIND_K8S_VERSION = v1.34.0
2929
# renovate: datasource=github-tags depName=norwoodj/helm-docs

cmd/gateway/commands.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ func getBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
776776

777777
info, ok := debug.ReadBuildInfo()
778778
if !ok {
779-
return
779+
return commitHash, commitTime, dirtyBuild
780780
}
781781
for _, kv := range info.Settings {
782782
switch kv.Key {
@@ -789,7 +789,7 @@ func getBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
789789
}
790790
}
791791

792-
return
792+
return commitHash, commitTime, dirtyBuild
793793
}
794794

795795
func createGatewayPodConfig(version, svcName string) (config.GatewayPodConfig, error) {

tests/framework/info.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func GetBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
6666

6767
info, ok := debug.ReadBuildInfo()
6868
if !ok {
69-
return
69+
return commitHash, commitTime, dirtyBuild
7070
}
7171

7272
for _, kv := range info.Settings {
@@ -80,7 +80,7 @@ func GetBuildInfo() (commitHash string, commitTime string, dirtyBuild string) {
8080
}
8181
}
8282

83-
return
83+
return commitHash, commitTime, dirtyBuild
8484
}
8585

8686
// AddNginxLogsAndEventsToReport adds nginx logs and events from the namespace to the report if the spec failed.

0 commit comments

Comments
 (0)