Skip to content

Commit 25ac035

Browse files
sameerforgeUnnati Mishra
authored andcommitted
Bump golang + golangci-lint
Signed-off-by: Sameer <sameer.khan@broadcom.com> Bump golang 1.25.7 Signed-off-by: Unnati Mishra <unnati.mishra@broadcom.com> Bump golang to 1.25.6 to fix CVEs Signed-off-by: Unnati Mishra <unnati.mishra@broadcom.com>
1 parent 97995c0 commit 25ac035

6 files changed

Lines changed: 15 additions & 16 deletions

File tree

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
go-version-file: go.mod
2828
- name: golangci-lint
29-
uses: golangci/golangci-lint-action@v6.0.1
29+
uses: golangci/golangci-lint-action@v7
3030
with:
31-
version: v1.64
31+
version: v2.4
3232
args: -v

.golangci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
run:
22
timeout: 5m
3+
version: "2"
34
linters:
45
enable:
56
- goheader
67
- revive
78
- unused
8-
disable-all: true
99
# all available settings of specific linters
10-
linters-settings:
11-
goheader:
12-
values:
13-
regexp:
14-
copyright-year: 20[0-9][0-9]
15-
template-path: code-header-template.txt
10+
settings:
11+
goheader:
12+
values:
13+
regexp:
14+
copyright-year: 20[0-9][0-9]
15+
template-path: code-header-template.txt
1616
issues:
1717
max-issues-per-linter: 0
1818
max-same-issues: 0
19-
exclude-use-default: false
2019
new-from-rev: c1a0a1445615c515f3b6f5006b857b8f426308ef # only enforce for commits after Jan 11 2022, allows us to phase-in godoc compliance

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.24.10 AS deps
1+
FROM --platform=$BUILDPLATFORM golang:1.25.7 AS deps
22

33
ARG TARGETOS TARGETARCH KCTRL_VER=development
44
WORKDIR /workspace

cli/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module carvel.dev/kapp-controller/cli
22

3-
go 1.24.10
3+
go 1.25.7
44

55
require (
66
carvel.dev/kapp-controller v0.59.0

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module carvel.dev/kapp-controller
22

3-
go 1.24.10
3+
go 1.25.7
44

55
require (
6-
carvel.dev/vendir v0.45.0
6+
carvel.dev/vendir v0.45.1
77
github.com/fatih/color v1.18.0 // indirect
88
github.com/gogo/protobuf v1.3.2
99
github.com/google/go-cmp v0.6.0 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
carvel.dev/vendir v0.45.0 h1:OWFKkn6Rfi2zPZKS/z68SeIYGrlSgKBXn4DYR178PGk=
2-
carvel.dev/vendir v0.45.0/go.mod h1:I3xaoQUBf20tQOjW2A0eXC1Hn94tYCL9VTmWHas4VKE=
1+
carvel.dev/vendir v0.45.1 h1:vVZjAEZz/j1HVLfm1/avlRF235skXpHFrx77GDqJMgo=
2+
carvel.dev/vendir v0.45.1/go.mod h1:t7/ulJsKBhyOAFyJUt3m1JyIdyvZsAh8eLGr0n1MiLk=
33
cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU=
44
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
55
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=

0 commit comments

Comments
 (0)