Skip to content

Commit 4eca0a8

Browse files
authored
Merge pull request #4358 from menahyouyeah/upgrade-go-version
security: upgrade golang to 1.25.6 to fix CVE-2025-61729
2 parents 8ca1716 + feaca8e commit 4eca0a8

File tree

10 files changed

+49
-26
lines changed

10 files changed

+49
-26
lines changed

.github/workflows/e2eEnvironment.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@ jobs:
3535
matrix:
3636
version: ["1.33", "1.34"]
3737
steps:
38+
- name: Checkout code
39+
uses: actions/checkout@v5
40+
with:
41+
path: go/src/github.com/kptdev/kpt
3842
- name: Set up Go
3943
uses: actions/setup-go@v6
4044
with:
41-
go-version: '>=1.24'
42-
- uses: actions/checkout@v5
45+
go-version-file: go/src/github.com/kptdev/kpt/go.mod
46+
cache: true
4347
# Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
4448
# If you upgrade this version confirm the changes match your expectations
4549
- name: Install KinD
@@ -49,6 +53,7 @@ jobs:
4953
skipClusterCreation: true
5054
skipClusterLogsExport: true
5155
- name: Run Tests
56+
working-directory: go/src/github.com/kptdev/kpt
5257
env:
5358
K8S_VERSION: ${{ matrix.version }}
5459
run: |

.github/workflows/go.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
run: |
5050
which podman
5151
podman version
52-
- name: Set up Go
53-
uses: actions/setup-go@v6
54-
with:
55-
go-version: '>=1.24'
56-
id: go
5752
- name: Check out code into the Go module directory
5853
uses: actions/checkout@v5
5954
with:
6055
path: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
56+
- name: Set up Go
57+
uses: actions/setup-go@v6
58+
with:
59+
go-version-file: go/src/github.com/kptdev/kpt/go.mod
60+
cache: true
6161
- name: Build, Test, Lint
6262
working-directory: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
6363
run: |
@@ -71,15 +71,15 @@ jobs:
7171
build-macos:
7272
runs-on: macos-latest
7373
steps:
74-
- name: Set up Go
75-
uses: actions/setup-go@v6
76-
with:
77-
go-version: '>=1.24'
78-
id: go
7974
- name: Check out code into the Go module directory
8075
uses: actions/checkout@v5
8176
with:
8277
path: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
78+
- name: Set up Go
79+
uses: actions/setup-go@v6
80+
with:
81+
go-version-file: go/src/github.com/kptdev/kpt/go.mod
82+
cache: true
8383
- name: Build
8484
working-directory: ${{ env.GOPATH }}/src/github.com/kptdev/kpt
8585
run: |

.github/workflows/live-e2e.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,15 @@ jobs:
3434
matrix:
3535
version: ["1.33.4@sha256:25a6018e48dfcaee478f4a59af81157a437f15e6e140bf103f85a2e7cd0cbbf2", "1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a"]
3636
steps:
37+
- name: Check out code
38+
uses: actions/checkout@v5
39+
with:
40+
path: go/src/github.com/kptdev/kpt
3741
- name: Set up Go
3842
uses: actions/setup-go@v6
3943
with:
40-
go-version: '>=1.24'
44+
go-version-file: go/src/github.com/kptdev/kpt/go.mod
45+
cache: true
4146
- uses: actions/checkout@v5
4247
# Pinned to Commit to ensure action is consistent: https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
4348
# If you upgrade this version confirm the changes match your expectations

.github/workflows/release.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,18 @@ jobs:
2727
outputs:
2828
hashes: ${{ steps.hash.outputs.hashes }}
2929
steps:
30-
- name: Set up Go
31-
uses: actions/setup-go@v6
32-
with:
33-
go-version: '>=1.24'
3430
- name: Checkout
3531
uses: actions/checkout@v5
3632
with:
3733
fetch-depth: 0
34+
path: go/src/github.com/kptdev/kpt
35+
- name: Set up Go
36+
uses: actions/setup-go@v6
37+
with:
38+
go-version-file: go/src/github.com/kptdev/kpt/go.mod
39+
cache: true
3840
- name: Build, Test, Lint
41+
working-directory: go/src/github.com/kptdev/kpt
3942
run: |
4043
git config --global user.email you@example.com
4144
git config --global user.name Your Name
@@ -57,6 +60,7 @@ jobs:
5760
with:
5861
distribution: goreleaser
5962
version: "~> v2"
63+
workdir: go/src/github.com/kptdev/kpt
6064
args: release --skip=validate -f release/tag/goreleaser.yaml
6165
env:
6266
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/verifyContent.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,24 @@ jobs:
3030
build:
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/setup-go@v6
33+
- name: Checkout
34+
uses: actions/checkout@v5
3435
with:
35-
go-version: '>=1.24'
36-
- uses: actions/checkout@v5
37-
- run: |
36+
path: go/src/github.com/kptdev/kpt
37+
- name: Set up Go
38+
uses: actions/setup-go@v6
39+
with:
40+
go-version-file: go/src/github.com/kptdev/kpt/go.mod
41+
cache: true
42+
- name: Build
43+
working-directory: go/src/github.com/kptdev/kpt
44+
run: |
3845
make build
3946
- name: Get dependencies
47+
working-directory: go/src/github.com/kptdev/kpt
4048
run: |
4149
make install-mdrip
4250
make install-kind
4351
- name: Verify Examples
52+
working-directory: go/src/github.com/kptdev/kpt
4453
run: make site-verify-examples

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
GOLANG_VERSION := 1.24.7
15+
GOLANG_VERSION := 1.25.6
1616
GORELEASER_CONFIG = release/tag/goreleaser.yaml
1717
GORELEASER_IMAGE := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION)
1818

documentation/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/kptdev/docs
22

3-
go 1.24.7
3+
go 1.25.6
44

55
require github.com/google/docsy v0.12.0 // indirect

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kptdev/kpt
22

3-
go 1.24.7
3+
go 1.25.6
44

55
require (
66
github.com/bytecodealliance/wasmtime-go v1.0.0

healthcheck/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kptdev/kpt/healthcheck
22

3-
go 1.24.7
3+
go 1.25.6
44

55
require (
66
k8s.io/apimachinery v0.34.1

rollouts/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kptdev/kpt/rollouts
22

3-
go 1.24.7
3+
go 1.25.6
44

55
require (
66
cloud.google.com/go/iam v0.13.0

0 commit comments

Comments
 (0)