Skip to content

Commit b20b26e

Browse files
authored
Update merge-next.sh
1 parent 3f2453b commit b20b26e

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

scripts/merge-train/merge-next.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,15 @@ TRAIN_BRANCH="$1"
7373

7474
# Check if PR has auto-merge enabled
7575
pr_info=$(get_pr_for_branch "$TRAIN_BRANCH")
76-
if [[ -n "$pr_info" ]]; then
77-
pr_number=$(echo "$pr_info" | jq -r '.number // empty')
78-
if [[ -n "$pr_number" ]] && pr_has_auto_merge "$pr_number"; then
79-
echo "PR #$pr_number has auto-merge enabled, skipping merge from next"
80-
exit 0
81-
fi
76+
if [[ -z "$pr_info" || "$pr_info" == "null" ]]; then
77+
echo "No open PR found for branch $TRAIN_BRANCH, skipping merge"
78+
exit 0
79+
fi
80+
81+
pr_number=$(echo "$pr_info" | jq -r '.number // empty')
82+
if [[ -n "$pr_number" ]] && pr_has_auto_merge "$pr_number"; then
83+
echo "PR #$pr_number has auto-merge enabled, skipping merge from next"
84+
exit 0
8285
fi
8386

8487
# Check if branch exists

0 commit comments

Comments
 (0)