Skip to content
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

Conversation

djdongjin
Copy link
Member

@djdongjin djdongjin commented Mar 6, 2025

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.

@dosubot dosubot bot added the dependencies Pull requests that update a dependency file label Mar 6, 2025
Signed-off-by: Jin Dong <[email protected]>

append

Signed-off-by: Jin Dong <[email protected]>
@djdongjin djdongjin force-pushed the 1-6-remove-hashi-multierror branch from 34563fb to 0733895 Compare March 6, 2025 17:42
@djdongjin
Copy link
Member Author

/retest

@djdongjin
Copy link
Member Author

/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]>
@djdongjin
Copy link
Member Author

djdongjin commented Mar 6, 2025

added commit 5: I have to cherrypick #11489 as well, otherwise pull-containerd-node-e2e-1-6 will fail

😅 a whole circular dependency: #11494 -> fix hashicorp/go-multierror (this PR) -> #11492 -> #11494. So include all fixes in this PR.

@djdongjin djdongjin changed the title [release/1.6] Remove hashicorp/go-multierror dependency [release/1.6] Remove hashicorp/go-multierror dependency and fix CI Mar 6, 2025
@samuelkarp samuelkarp merged commit 176129f into containerd:release/1.6 Mar 7, 2025
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file size/XXL
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants