chore(release): make version script watch for version PR merged

Author: wjhsf

scripts/release/publish.sh

@@ -36,23 +36,14 @@ if which gh >/dev/null; then
   git branch -D "$BRANCH"
 
   # Wait for CI to complete
+  ./wait-for-pr.sh "$BRANCH"
   if ! gh pr checks --fail-fast --watch; then
     echo 'CI failed. Cannot continue with release.'
     gh pr view "$BRANCH" --web
     exit 1
   fi
 
-  # Also wait for approvals, if needed
-  if [ "$(gh pr view "$BRANCH" --json reviewDecision -q .reviewDecision)" != 'APPROVED' ]; then
-    echo 'Release cannot continue without approval.'
-    while [ "$(gh pr view "$BRANCH" --json reviewDecision --jq .reviewDecision)" != 'APPROVED' ]; do
-      sleep 30
-    done
-    echo 'PR approved! Continuing...'
-  else
-    sleep 10 # Give nucleus time to start the release job
-  fi
-
+  sleep 10 # Give nucleus time to start the release job
   RELEASE_JOB=$(gh pr checks "$BRANCH" --json name,link -q '.[]|select(.name=="continuous-integration/nucleus/release").link')
   echo "Nucleus release started: $RELEASE_JOB"
 

scripts/release/release.sh

@@ -15,4 +15,4 @@ fi
 echo 'Creating version bump PR...'
 ./version.sh "$1"
 echo 'Creating release PR...'
-./publish.sh "$2"
+./publish.sh "$2"

scripts/release/version.sh

@@ -37,10 +37,12 @@ if which gh 2>/dev/null 1>/dev/null; then
   gh pr merge --auto --squash --delete-branch
   git switch "$BASE_BRANCH"
   git branch -D "$BRANCH"
-  if ! gh pr checks --fail-fast --watch "$BRANCH"; then
-    echo 'CI failed. Cannot continue with release.'
-    exit 1
-  fi
+  
+  ./wait-for-pr.sh "$BRANCH"
+  while [ "$(gh pr view "$BRANCH" --json state -q .state)" != 'MERGED' ]; do
+    sleep 3 # Wait for GitHub to auto-merge the PR
+  done
+
 else
   # Clean up and prompt for manual branch creation
   git switch "$BASE_BRANCH"

scripts/release/wait-for-pr.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env/bash
+
+# Waits until a PR is ready to be merged
+# Usage: ./wait-for-pr.sh <branch name or PR number>
+# Example: ./wait-for-pr.sh 'my-branch-with-cool-changes'
+
+set -e
+
+BRANCH="$1"
+if [ -z "$BRANCH" ]; then
+  echo 'Please specify a branch name or PR number.'
+  exit 1
+fi
+
+# Wait for CI to complete
+if ! gh pr checks --fail-fast --watch; then
+  echo 'CI failed. Cannot continue with release.'
+  gh pr view "$BRANCH" --web
+  exit 1
+fi
+
+# Also wait for approvals, if needed
+if [ "$(gh pr view "$BRANCH" --json reviewDecision -q .reviewDecision)" != 'APPROVED' ]; then
+  echo 'Waiting for PR approval.'
+  while [ "$(gh pr view "$BRANCH" --json reviewDecision --jq .reviewDecision)" != 'APPROVED' ]; do
+    sleep 30
+  done
+  echo 'PR approved! Continuing...'
+fi