Skip to content

ci: update crun version to 1.14.3#9848

Merged
estesp merged 1 commit intocontainerd:mainfrom
akhilerm:update-crun-version
Feb 21, 2024
Merged

ci: update crun version to 1.14.3#9848
estesp merged 1 commit intocontainerd:mainfrom
akhilerm:update-crun-version

Conversation

@akhilerm
Copy link
Copy Markdown
Member

@akhilerm akhilerm commented Feb 21, 2024 •
edited
Loading

Changes:
containers/crun@1.14...1.14.3

update crun version to 1.14.3, as it is needed for updating the runtime-spec to v1.2.0 to fix failures in https://github.com/containerd/containerd/actions/runs/7983425010/job/21803586362#step:12:517

@akhilerm
ci: update crun version to 1.14.3
bd48104 
Changes:
containers/crun@1.14...1.14.3

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
@akhilerm akhilerm force-pushed the update-crun-version branch from aa3cabb to bd48104 Compare February 21, 2024 13:16
@akhilerm akhilerm added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Feb 21, 2024
@estesp estesp added this pull request to the merge queue Feb 21, 2024
Merged via the queue into containerd:main with commit b93409c Feb 21, 2024
@akhilerm akhilerm deleted the update-crun-version branch February 22, 2024 03:26
@akhilerm
Copy link
Copy Markdown
Member Author

akhilerm commented Feb 22, 2024

/cherry-pick release/1.7

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

k8s-infra-cherrypick-robot commented Feb 22, 2024

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

Applying: ci: update crun version to 1.14.3
Using index info to reconstruct a base tree...
M	script/setup/crun-version
Falling back to patching base and 3-way merge...
Auto-merging script/setup/crun-version
CONFLICT (content): Merge conflict in script/setup/crun-version
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ci: update crun version to 1.14.3
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/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/test-infra repository.

This was referenced Feb 22, 2024
Merged
Merged
@AkihiroSuda AkihiroSuda added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Apr 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch size/XS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@akhilerm @k8s-infra-cherrypick-robot @dmcgowan @estesp @AkihiroSuda @k8s-ci-robot