Skip to content

ci: add build/test go1.26.0, drop go1.24#12844

Merged
mxpv merged 3 commits intocontainerd:mainfrom
akhilerm:go-1.26
Feb 18, 2026
Merged

ci: add build/test go1.26.0, drop go1.24#12844
mxpv merged 3 commits intocontainerd:mainfrom
akhilerm:go-1.26

Conversation

@akhilerm
Copy link
Copy Markdown
Member

@akhilerm akhilerm commented Feb 1, 2026

  • add go1.26.0 into build and test matrix
  • drop go1.24
  • drop windows/arm builds
  • update golangci-lint to v2.9.0 for go1.26 support

@dosubot
Copy link
Copy Markdown

dosubot Bot commented Feb 1, 2026

Related Documentation

No published documentation to review for changes on this repository.

Write your first living document

How did I do? Any feedback?  Join Discord

@dosubot dosubot Bot added the github_actions Pull requests that update GitHub Actions code label Feb 1, 2026
@akhilerm akhilerm changed the title [DNM] ci: build/test go1.26-rc.2 [DNM] ci: build/test go1.26.0-rc.2 Feb 1, 2026
@akhilerm akhilerm changed the title [DNM] ci: build/test go1.26.0-rc.2 [DNM] ci: build/test go1.26.0-rc Feb 10, 2026
@akhilerm akhilerm changed the title [DNM] ci: build/test go1.26.0-rc ci: add build/test go1.26.0, drop go1.24 Feb 11, 2026
@akhilerm akhilerm added the area/toolchain Build and Release Toolchain label Feb 11, 2026
@thaJeztah
Copy link
Copy Markdown
Member

Looks like CI settings need to be updated, because the windows/arm build was removed /cc @dmcgowan (not sure who all has permissions to change those);

Screenshot 2026-02-11 at 14 15 50

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

we probably want to backport this to the release branches, now that go1.24 reached end of the line.

@thaJeztah thaJeztah 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 Feb 11, 2026
add go1.26.0 into test matrix and remove go1.24

Signed-off-by: Akhil Mohan <[email protected]>
Comment thread .github/actions/install-go/action.yml
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@samuelkarp samuelkarp added this pull request to the merge queue Feb 12, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Feb 12, 2026
@estesp estesp added this pull request to the merge queue Feb 12, 2026
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Feb 12, 2026
@akhilerm akhilerm moved this from Review In Progress to Merge on Green in Pull Request Review Feb 18, 2026
@mxpv mxpv added this pull request to the merge queue Feb 18, 2026
Merged via the queue into containerd:main with commit 97c4540 Feb 18, 2026
94 of 96 checks passed
@github-project-automation github-project-automation Bot moved this from Merge on Green to Done in Pull Request Review Feb 18, 2026
@akhilerm akhilerm deleted the go-1.26 branch February 18, 2026 05:30
@thaJeztah
Copy link
Copy Markdown
Member

/cherry-pick release/2.2 release/2.1 release/1.7

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@thaJeztah: new pull request created: #12917

Details

In response to this:

/cherry-pick release/2.2 release/2.1 release/1.7

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.

@akhilerm akhilerm added cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch and removed cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Feb 19, 2026
@akhilerm
Copy link
Copy Markdown
Member Author

/cherry-pick release/2.1
/cherry-pick release/1.7

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@akhilerm: #12844 failed to apply on top of branch "release/1.7":

Applying: ci: build/test go1.26.0
Using index info to reconstruct a base tree...
A	.devcontainer/devcontainer.json
M	.github/workflows/api-release.yml
M	.github/workflows/ci.yml
M	.github/workflows/release/Dockerfile
M	Vagrantfile
M	contrib/Dockerfile.test
M	contrib/fuzz/oss_fuzz_build.sh
M	script/setup/prepare_env_windows.ps1
Falling back to patching base and 3-way merge...
Auto-merging script/setup/prepare_env_windows.ps1
Auto-merging contrib/fuzz/oss_fuzz_build.sh
Auto-merging contrib/Dockerfile.test
Auto-merging Vagrantfile
Auto-merging .github/workflows/release/Dockerfile
Auto-merging .github/workflows/ci.yml
Auto-merging .github/workflows/api-release.yml
CONFLICT (modify/delete): .devcontainer/devcontainer.json deleted in HEAD and modified in ci: build/test go1.26.0. Version ci: build/test go1.26.0 of .devcontainer/devcontainer.json left in tree.
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 set advice.mergeConflict false"
Patch failed at 0001 ci: build/test go1.26.0

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/1.7

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.

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@akhilerm: #12844 failed to apply on top of branch "release/2.1":

Applying: ci: build/test go1.26.0
Applying: remove windows/arm from cross build
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/ci.yml
Applying: update golangci-lint to v2.9.0 with go1.26 support
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/ci.yml
CONFLICT (content): Merge conflict in .github/workflows/ci.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 set advice.mergeConflict false"
Patch failed at 0003 update golangci-lint to v2.9.0 with go1.26 support

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/1.7

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.

@apurv15
Copy link
Copy Markdown
Contributor

apurv15 commented Feb 27, 2026

While windows/arm pipelines are removed here, should windows/arm64 (64-bit) be added instead?

@thaJeztah
Copy link
Copy Markdown
Member

Yeah probably should be added; I'd expected it to already be there, but looks like it's not (not sure why not though; I know arm(64) support on Windows was still somewhat in development, so perhaps because of that?)

@apurv15 feel free to open a PR (at least for further discussion)

@chrishenzie chrishenzie added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch and removed 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 labels Apr 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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.0.x PR commits are cherry picked into the release/2.0 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

Archived in project

Development

Successfully merging this pull request may close these issues.

9 participants