Skip to content

Commit 04b02fe

Browse files
authored
feat: improve milestone merge workflows. (#958)
1 parent 950d8f2 commit 04b02fe

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

.github/workflows/merge-from-milestone.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,13 +331,21 @@ jobs:
331331
mv /tmp/milestone_migration/results.json.tmp /tmp/milestone_migration/results.json
332332
else
333333
echo "Failed to create PR"
334+
335+
echo "Deleting branch $new_branch since PR creation failed"
336+
git push origin --delete $new_branch 2>/dev/null || echo "Branch deletion failed"
337+
334338
# Record failure
335339
jq --argjson result "{\"original_pr\": $pr_number, \"status\": \"failure\", \"message\": \"Failed to create PR\"}" \
336340
'.+= [$result]' /tmp/milestone_migration/results.json > /tmp/milestone_migration/results.json.tmp
337341
mv /tmp/milestone_migration/results.json.tmp /tmp/milestone_migration/results.json
338342
fi
339343
else
340344
echo "⏭️ Skip PR #$pr_number: no actual changes"
345+
346+
echo "Deleting branch $new_branch since PR creation failed"
347+
git push origin --delete $new_branch 2>/dev/null || echo "Branch deletion failed"
348+
341349
# Record as skipped
342350
jq --argjson result "{\"original_pr\": $pr_number, \"status\": \"skipped\", \"message\": \"No actual changes\"}" \
343351
'.+= [$result]' /tmp/milestone_migration/results.json > /tmp/milestone_migration/results.json.tmp
@@ -348,6 +356,8 @@ jobs:
348356
git checkout $TARGET_BRANCH
349357
done
350358
359+
# Pending
360+
351361
# - name: Create results report
352362
# run: |
353363
# echo "Generating results report..."

0 commit comments

Comments
 (0)