From 1e2375faca1cb2ee3b08723f9627856db950cad4 Mon Sep 17 00:00:00 2001
From: Monet Lee <monet_lee@163.com>
Date: Tue, 17 Jun 2025 15:12:25 +0800
Subject: [PATCH] fix: improve mileston PR workflows contents. (#3382)

---
 .github/workflows/merge-from-milestone.yml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-from-milestone.yml b/.github/workflows/merge-from-milestone.yml
index 1f5762ccb..a0ec2ac16 100644
--- a/.github/workflows/merge-from-milestone.yml
+++ b/.github/workflows/merge-from-milestone.yml
@@ -155,11 +155,27 @@ jobs:
                   '{title: $title, head: $head, base: $base, body: $body}')")
 
               new_pr_number=$(echo "$response" | jq -r '.number')
-              echo "Created PR #$new_pr_number"
 
-              curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
+              if [[ "$new_pr_number" == "null" || -z "$new_pr_number" ]]; then
+                echo "Failed to create PR. Response: $response"
+              
+                git checkout $TARGET_BRANCH
+
+                git branch -D $cherry_pick_branch
+                
+                echo "Deleted branch: $cherry_pick_branch"
+                git push origin --delete $cherry_pick_branch
+              else
+                echo "Created PR #$new_pr_number"
+
+                curl -s -X POST -H "Authorization: token $GITHUB_TOKEN" \
                 -H "Accept: application/vnd.github+json" \
                 -d '{"labels": ["milestone-merge"]}' \
                 "https://api.github.com/repos/${{ github.repository }}/issues/$new_pr_number/labels"
+              fi
+
+              echo ""
+              echo "----------------------------------------"
+              echo ""
             fi
           done