Skip to content

CI: arm64-8core-32gb -> ubuntu-24.04-arm#11427

Merged
estesp merged 1 commit intocontainerd:mainfrom
AkihiroSuda:gha-arm
Feb 25, 2025
Merged

CI: arm64-8core-32gb -> ubuntu-24.04-arm#11427
estesp merged 1 commit intocontainerd:mainfrom
AkihiroSuda:gha-arm

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda commented Feb 25, 2025

@AkihiroSuda AkihiroSuda added cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Feb 25, 2025
@dosubot dosubot Bot added the area/github_actions Pull requests that update GitHub Actions code label Feb 25, 2025
@estesp estesp added this pull request to the merge queue Feb 25, 2025
Merged via the queue into containerd:main with commit 543db05 Feb 25, 2025
@AkihiroSuda
Copy link
Copy Markdown
Member Author

AkihiroSuda commented Feb 25, 2025

/cherry-pick release/2.0

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

k8s-infra-cherrypick-robot commented Feb 25, 2025

@AkihiroSuda: #11427 failed to apply on top of branch "release/2.0":

Applying: CI: arm64-8core-32gb -> ubuntu-24.04-arm
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 advice.mergeConflict false"
Patch failed at 0001 CI: arm64-8core-32gb -> ubuntu-24.04-arm
Details

In response to this:

/cherry-pick release/2.0

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.

This was referenced Feb 26, 2025
Merged
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 cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/1.6.x cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Feb 26, 2025
@djdongjin djdongjin mentioned this pull request Mar 10, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

area/github_actions Pull requests that update GitHub Actions code 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 cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch size/S

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@AkihiroSuda @k8s-infra-cherrypick-robot @estesp @fuweid @k8s-ci-robot