-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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.
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
[release/1.6] Remove hashicorp/go-multierror dependency and fix CI #11500
Merged
samuelkarp
merged 5 commits into
containerd:release/1.6
from
djdongjin:1-6-remove-hashi-multierror
Mar 7, 2025
Merged
[release/1.6] Remove hashicorp/go-multierror dependency and fix CI #11500
samuelkarp
merged 5 commits into
containerd:release/1.6
from
djdongjin:1-6-remove-hashi-multierror
Mar 7, 2025
Conversation
This file contains 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
Co-authored-by: Akhil Mohan <[email protected]> Signed-off-by: Jin Dong <[email protected]>
Signed-off-by: Jin Dong <[email protected]>
Signed-off-by: Jin Dong <[email protected]> append Signed-off-by: Jin Dong <[email protected]>
Signed-off-by: Jin Dong <[email protected]>
34563fb
to
0733895
Compare
samuelkarp
approved these changes
Mar 6, 2025
estesp
approved these changes
Mar 6, 2025
/retest |
/test pull-containerd-node-e2e-1-6 |
use the shim bundled with cri-cni-containerd tar rather than using the shim present on the host machine for running e2e Signed-off-by: Akhil Mohan <[email protected]> (cherry picked from commit 393ad5b) Signed-off-by: Jin Dong <[email protected]>
austinvazquez
approved these changes
Mar 6, 2025
samuelkarp
approved these changes
Mar 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 PR contains 4 commits to fix the CI on 1.6 release branch:
commit 1: update project check to 1.2.1 as the current version is broken (same as #11495)
commit 2: 1 requires removing hashicorp/go-multierror. To use go's native multi errror, we need golang 1.20.
commit 3: remove hashicorp/go-multierror by using go's native multi error.
commit 4: remove unnecessary join error unwrap.
pull-containerd-node-e2e-1-6
will fail 😅