[release/1.7] backport windows runner and golang toolchain updates#11972
Merged
AkihiroSuda merged 5 commits intocontainerd:release/1.7from Jul 15, 2025
Merged
Conversation
|
Skipping CI for Draft Pull Request. |
16c2bff to
b9bcac1
Compare
d2eb354 to
41244eb
Compare
Member
Author
|
Debugging why image load tests are not being skipped on Windows 2025. |
dec5cbf to
a6d949a
Compare
Member
Author
|
Okay the challenge with skipping the tests on Windows 2025 for release/1.7 branch is the build number returned by hcsshim is slightly different. It seems to be related to this change in hcsshim. So I am thinking the cri test binary here is not manifested which is causing the skip logic to fail. Adding some debug information to a test CI run (I don't have a Windows machine to test locally) to see if we can workaround it without having to update hcsshim in the release branches. |
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 2f1948a) Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
- go1.23.8 (released 2025-04-01) includes security fixes to the net/http package, as well as bug fixes to the runtime and the go command. Ref: https://github.com/golang/go/issues?q=milestone%3AGo1.23.8+label%3ACherryPickApproved - go1.24.2 (released 2025-04-01) includes security fixes to the net/http package, as well as bug fixes to the compiler, the runtime, the go command, and the crypto/tls, go/types, net/http, and testing packages. Ref: https://github.com/golang/go/issues?q=milestone%3AGo1.24.2+label%3ACherryPickApproved Signed-off-by: Akhil Mohan <akhilerm@gmail.com> (cherry picked from commit 5629e9f) Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
use go1.23.8 as the default go version for running in CI and making release binaries. NOTE: This is done so that when release/2.1 branch cut happens the 2.1 release uses 1.23.x for building release binaries rather than 1.24.x. Once the 2.1 release is out, this will be reverted and go1.24.x will be made the default in the main branch Signed-off-by: Akhil Mohan <akhilerm@gmail.com> (cherry picked from commit 6f93c65) Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com>
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com> (cherry picked from commit fea77e1)
Signed-off-by: Austin Vazquez <austin.vazquez.dev@gmail.com> (cherry picked from commit 415df38)
a6d949a to
a35978f
Compare
Member
Author
Member
Author
|
I have root caused the fuzz failures to be unrelated to this change and opened #12007 with the findings. Can those be considered that non-blocking for now? |
dmcgowan
approved these changes
Jun 21, 2025
Member
Author
|
Needs one more pair of eyes. Unblocks v1.7.28 release. |
akhilerm
approved these changes
Jul 1, 2025
AkihiroSuda
approved these changes
Jul 15, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This change backports a few CI updates for to release/1.7 branch.
Note: cherry-picks were not clean as 1) unlike the release branches main no longer supports Go 1.23 2) the integration test help function for skipping tests on Windows 2025 runners moved from
integration/clienttointegration/platformdue tointegration/clientbeing a module in release/1.7 branch 3) the pre- 0.13.0 hcsshim library for osversion required the application to be manifested with the OS version, so this change copies the version code added to 0.13.0 which no longer requires the manifest.