Skip to content

Improve back-porting script #9638

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
merged 1 commit into from
Oct 1, 2025
+5 −5
Merged

Improve back-porting script #9638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions tooling/mirror-community-pull-request.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ gh --version 1>/dev/null 2>&1 || { echo "❌ gh is not installed. Please install
# Check jq is installed
jq --version 1>/dev/null 2>&1 || { echo "❌ jq is not installed. Please install jq."; exit 1; }
# Check there are no local changes
git diff --exit-code || { echo "❌ There are local changes. Please commit or stash them."; exit 1; }
git diff --quiet --exit-code || { echo "❌ There are local changes. Please commit or stash them."; exit 1; }

#
# Fetch PR information.
Expand All @@ -67,7 +67,7 @@ if [ -z "$PR_DATA" ]; then
exit 1
fi
# Parse PR details
FORK_REPO=$(echo "$PR_DATA" | jq -r '(.headRepository.nameWithOwner // (.headRepositoryOwner.login + "/" + .headRepository.name)) // empty')
FORK_REPO=$(echo "$PR_DATA" | jq -r '(.headRepository.nameWithOwner | select(. != "" and . != null)) // (.headRepositoryOwner.login + "/" + .headRepository.name) // empty')
FORK_BRANCH=$(echo "$PR_DATA" | jq -r '.headRefName // empty')
PR_TITLE=$(echo "$PR_DATA" | jq -r '.title // empty')
PR_AUTHOR=$(echo "$PR_DATA" | jq -r '.author.login // empty')
Expand Down Expand Up @@ -127,12 +127,12 @@ echo "- Cherry-picking and signing commits from PR"
for COMMIT in $PR_COMMITS; do
echo " - Cherry-picking $COMMIT"
# Check if this is a merge commit
CHERRY_PICK_ARGS="-S"
CHERRY_PICK_ARGS=("-S")
PARENT_COUNT=$(git rev-list --parents -n 1 "$COMMIT" 2>/dev/null | wc -w)
if [ "$PARENT_COUNT" -gt 2 ]; then
CHERRY_PICK_ARGS="$CHERRY_PICK_ARGS -m 1"
CHERRY_PICK_ARGS+=("-m" "1")
fi
if ! git cherry-pick "$CHERRY_PICK_ARGS" "$COMMIT"; then
if ! git cherry-pick "${CHERRY_PICK_ARGS[@]}" "$COMMIT"; then
# Check if it's an empty commit
if ! git diff --cached --quiet || ! git diff --quiet; then
echo "❌ Failed to cherry-pick merge commit $COMMIT"
Expand Down