Merged
Conversation
Member
|
Ah, right, but that also requires the default branch we use for CI to be switched to release/v2.2, because the main branch now requires go1.26 (because ... kubernetes) |
thaJeztah
reviewed
Apr 15, 2026
| @@ -518,7 +518,7 @@ target "_pkg-containerd" { | |||
| PKG_NAME = PKG_NAME != null && PKG_NAME != "" ? PKG_NAME : "containerd.io" | |||
| PKG_REPO = PKG_REPO != null && PKG_REPO != "" ? PKG_REPO : "https://github.com/containerd/containerd.git" | |||
| PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main" | |||
Member
There was a problem hiding this comment.
Suggested change
| PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "main" | |
| PKG_REF = PKG_REF != null && PKG_REF != "" ? PKG_REF : "release/2.2" |
Member
There was a problem hiding this comment.
or should we have a matrix in CI? (main, release/2.2)
Collaborator
Author
There was a problem hiding this comment.
I think it's ok to keep it simple for now and use the 2.2 branch
1.26 comes from the main branch but the last release (2.2.3) is still on Go 1.25. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
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
2 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.
1.26 comes from the main branch but the last release (2.2.3) is still on Go 1.25.
For a follow up: