File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -336,18 +336,18 @@ jobs:
336336 PR_NUMBER=$(echo "$PR_URL" | grep -oP '\d+$')
337337 echo "pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
338338
339- - name : Wait for CI and auto- merge
339+ - name : Enable auto-merge and wait for merge
340340 env :
341341 GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
342342 run : |
343343 PR_NUMBER="${{ steps.version_pr.outputs.pr_number }}"
344344
345- echo "Waiting for CI checks to complete on PR #${PR_NUMBER}..."
346-
347- # Enable auto-merge
345+ echo "Enabling auto-merge for PR #${PR_NUMBER}..."
348346 gh pr merge "$PR_NUMBER" --auto --squash
349347
350- # Wait for PR to be merged (with timeout)
348+ echo "Waiting for PR to be merged..."
349+
350+ # Wait for PR to merge (with timeout)
351351 TIMEOUT=600 # 10 minutes
352352 ELAPSED=0
353353 INTERVAL=10
@@ -360,7 +360,7 @@ jobs:
360360 break
361361 fi
362362
363- echo "PR state: $STATE. Waiting..."
363+ echo "PR state: $STATE. Waiting for checks to complete ..."
364364 sleep $INTERVAL
365365 ELAPSED=$((ELAPSED + INTERVAL))
366366 done
You can’t perform that action at this time.
0 commit comments