Skip to content

ci: bump Go 1.24.11, 1.25.5 #12615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
mxpv merged 2 commits into from
Dec 3, 2025
Merged

ci: bump Go 1.24.11, 1.25.5 #12615

mxpv merged 2 commits into from
Dec 3, 2025
+10 −10

Conversation

@austinvazquez
Copy link
Member

@austinvazquez austinvazquez commented Dec 3, 2025 •
edited
Loading

This change bumps the golang version used in CI to 1.24.11, 1.25.5.

go1.24.10 (released 2025-11-05) includes fixes to the encoding/pem and net/url packages. See the Go 1.24.10 milestone on our issue tracker for details.

go1.24.11 (released 2025-12-02) includes two security fixes to the crypto/x509 package, as well as bug fixes to the runtime. See the Go 1.24.11 milestone on our issue tracker for details.

full diff: golang/go@go1.24.9...go1.24.11

@austinvazquez
ci: bump Go 1.24.10, 1.25.4
65ad60e 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
@austinvazquez
ci: bump Go 1.24.11, 1.25.5
127b163 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
@austinvazquez austinvazquez self-assigned this Dec 3, 2025
@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Dec 3, 2025
@dosubot dosubot bot added area/toolchain Build and Release Toolchain github_actions Pull requests that update GitHub Actions code labels Dec 3, 2025
@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Dec 3, 2025
@mxpv mxpv added this pull request to the merge queue Dec 3, 2025
Merged via the queue into containerd:main with commit 761e14b Dec 3, 2025
52 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Dec 3, 2025
@austinvazquez austinvazquez added cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 4, 2025
@austinvazquez austinvazquez deleted the update-go-120325 branch December 4, 2025 14:03
@austinvazquez
Copy link
Member Author

austinvazquez commented Dec 4, 2025

/cherry-pick release/2.2

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 4, 2025

@austinvazquez: #12615 failed to apply on top of branch "release/2.2":

Applying: ci: bump Go 1.24.10, 1.25.4
Using index info to reconstruct a base tree...
M	.github/workflows/api-release.yml
M	.github/workflows/ci.yml
M	.github/workflows/release/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/release/Dockerfile
CONFLICT (content): Merge conflict in .github/workflows/release/Dockerfile
Auto-merging .github/workflows/ci.yml
Auto-merging .github/workflows/api-release.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 ci: bump Go 1.24.10, 1.25.4
Details

In response to this:

/cherry-pick release/2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

This was referenced Dec 4, 2025
Merged
Merged
@austinvazquez austinvazquez added cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch and removed cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 4, 2025
@austinvazquez austinvazquez mentioned this pull request Dec 4, 2025
Merged
@austinvazquez austinvazquez added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Dec 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mxpv mxpv mxpv approved these changes

@akhilerm akhilerm akhilerm approved these changes

Assignees

@austinvazquez austinvazquez

Labels

area/toolchain Build and Release Toolchain cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch github_actions Pull requests that update GitHub Actions code size/S

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@austinvazquez @k8s-infra-cherrypick-robot @mxpv @akhilerm @k8s-ci-robot