Skip to content

Revert "[CI] Update cherry-pick.yml" #6

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.

Sign up for GitHub

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

Merged
EmmonsCurse merged 2 commits into from
Apr 22, 2026
Merged

Revert "[CI] Update cherry-pick.yml" #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef86fd1
Revert "[CI] Update cherry-pick.yml"
EmmonsCurse Apr 22, 2026
71fef25
Update cherry-pick.yml
EmmonsCurse Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions .github/workflows/cherry-pick.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,15 @@ jobs:
git fetch origin "$TARGET_BRANCH"
git checkout -b "$NEW_BRANCH" "origin/$TARGET_BRANCH"

# If PR_TITLE starts with "[", don't insert an extra space.
if [ "${PR_TITLE:0:1}" = "[" ]; then
NEW_TITLE="[Cherry-Pick]$PR_TITLE(#$PR_NUMBER)"
else
NEW_TITLE="[Cherry-Pick] $PR_TITLE(#$PR_NUMBER)"
fi

# Cherry pick
# Try standard cherry-pick first (for squash merges or single commits)
if git cherry-pick "$MERGE_COMMIT_SHA"; then
echo "Cherry-pick successful."
git commit --amend -m "$NEW_TITLE"
else
echo "Standard cherry-pick failed, trying with -m 1 (for merge commits)..."
git cherry-pick --abort
if git cherry-pick -m 1 "$MERGE_COMMIT_SHA"; then
echo "Cherry-pick with -m 1 successful."
git commit --amend -m "$NEW_TITLE"
else
echo "Cherry-pick failed."
git cherry-pick --abort
Expand All @@ -143,7 +134,14 @@ jobs:
echo "Pushing to fork..."
git push "$FORK_URL_AUTH" "$NEW_BRANCH" --force

# Create PR
# Create PR DEBUG
# If PR_TITLE starts with "[", don't insert an extra space.
if [ "${PR_TITLE:0:1}" = "[" ]; then
NEW_TITLE="[Cherry-Pick]$PR_TITLE(#$PR_NUMBER)"
else
NEW_TITLE="[Cherry-Pick] $PR_TITLE(#$PR_NUMBER)"
fi

NEW_BODY="Cherry-pick of #$PR_NUMBER (authored by @${PR_AUTHOR}) to \`$TARGET_BRANCH\`.

devPR:https://github.com/PaddlePaddle/FastDeploy/pull/$PR_NUMBER <!-- For pass CI -->
Expand Down
Loading