lasdf1234 commented on code in PR #12276:
URL: https://github.com/apache/gravitino/pull/12276#discussion_r3681292918
##########
.github/workflows/cherry-pick-branch.yml:
##########
@@ -110,25 +115,48 @@ jobs:
EOF
)
else
+ # Make conflicts visible in the PR list (title + label), not only
in the body.
+ TITLE="[DO NOT MERGE] ${TITLE}"
+ LABELS+=(cherry-pick-conflict)
+
BODY=$(cat <<'EOF'
**Cherry-pick Information:**
- Original commit: ${COMMIT_SHA}
- Target branch: `${TARGET_BRANCH}`
- Status: ⚠️ **Has conflicts - manual resolution required**
-
+
+ **Do not merge** until conflict markers are resolved and the
+ `cherry-pick-conflict` label is removed.
+
Please review and resolve the conflicts before merging.
EOF
)
fi
-
+
# Replace placeholders with actual values
BODY="${BODY//\$\{COMMIT_SHA\}/${COMMIT_SHA}}"
BODY="${BODY//\$\{TARGET_BRANCH\}/${TARGET_BRANCH}}"
-
- gh pr create \
- --title "$TITLE" \
- --body "$BODY" \
- --base ${{ inputs.target-branch }} \
- --head ${{ steps.cherry-pick.outputs.branch-name }} \
- --label cherry-pick \
- --reviewer jerryshao || echo "Failed to create PR, may already
exist"
+
+ # Ensure labels exist (forks may not have them yet).
+ gh label create cherry-pick --description "Automatically
opened cherry-pick PR" --color 1D76DB --force
>/dev/null 2>&1 || true
Review Comment:
Thank you very much for your valuable suggestions. All the related issues
have been fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
