chore: sync local Mosaic changes

rails/git/pr-merge.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # pr-merge.sh - Merge pull requests on Gitea or GitHub
-# Usage: pr-merge.sh -n PR_NUMBER [-m method] [-d]
+# Usage: pr-merge.sh -n PR_NUMBER [-m squash] [-d] [--skip-queue-guard]
 
 set -e
 
@@ -9,8 +9,9 @@ source "$SCRIPT_DIR/detect-platform.sh"
 
 # Default values
 PR_NUMBER=""
-MERGE_METHOD="merge"  # merge, squash, rebase
+MERGE_METHOD="squash"
 DELETE_BRANCH=false
+SKIP_QUEUE_GUARD=false
 
 usage() {
     cat <<EOF
@@ -20,14 +21,16 @@ Merge a pull request on the current repository (Gitea or GitHub).
 
 Options:
     -n, --number NUMBER     PR number to merge (required)
-    -m, --method METHOD     Merge method: merge, squash, rebase (default: merge)
+    -m, --method METHOD     Merge method: squash only (default: squash)
     -d, --delete-branch     Delete the head branch after merge
+        --skip-queue-guard  Skip CI queue guard wait before merge
     -h, --help              Show this help message
 
 Examples:
     $(basename "$0") -n 42                    # Merge PR #42
     $(basename "$0") -n 42 -m squash          # Squash merge
-    $(basename "$0") -n 42 -m rebase -d       # Rebase and delete branch
+    $(basename "$0") -n 42 -d                 # Squash merge and delete branch
+    $(basename "$0") -n 42 --skip-queue-guard # Skip queue guard wait
 EOF
     exit 1
 }
@@ -47,6 +50,10 @@ while [[ $# -gt 0 ]]; do
             DELETE_BRANCH=true
             shift
             ;;
+        --skip-queue-guard)
+            SKIP_QUEUE_GUARD=true
+            shift
+            ;;
         -h|--help)
             usage
             ;;
@@ -62,37 +69,36 @@ if [[ -z "$PR_NUMBER" ]]; then
     usage
 fi
 
+if [[ "$MERGE_METHOD" != "squash" ]]; then
+    echo "Error: Mosaic policy enforces squash merge only. Received '$MERGE_METHOD'." >&2
+    exit 1
+fi
+
+BASE_BRANCH="$("$SCRIPT_DIR/pr-metadata.sh" -n "$PR_NUMBER" | python3 -c 'import json, sys; print((json.load(sys.stdin).get("baseRefName") or "").strip())')"
+if [[ "$BASE_BRANCH" != "main" ]]; then
+    echo "Error: Mosaic policy allows merges only for PRs targeting 'main' (found '$BASE_BRANCH')." >&2
+    exit 1
+fi
+
+if [[ "$SKIP_QUEUE_GUARD" != true ]]; then
+    "$SCRIPT_DIR/ci-queue-wait.sh" \
+        --purpose merge \
+        -B "$BASE_BRANCH" \
+        -t "${MOSAIC_CI_QUEUE_TIMEOUT_SEC:-900}" \
+        -i "${MOSAIC_CI_QUEUE_POLL_SEC:-15}"
+fi
+
 PLATFORM=$(detect_platform)
 
 case "$PLATFORM" in
     github)
-        CMD="gh pr merge $PR_NUMBER"
-        case "$MERGE_METHOD" in
-            merge)   CMD="$CMD --merge" ;;
-            squash)  CMD="$CMD --squash" ;;
-            rebase)  CMD="$CMD --rebase" ;;
-            *)
-                echo "Error: Invalid merge method '$MERGE_METHOD'" >&2
-                exit 1
-                ;;
-        esac
+        CMD="gh pr merge $PR_NUMBER --squash"
         [[ "$DELETE_BRANCH" == true ]] && CMD="$CMD --delete-branch"
         eval "$CMD"
         ;;
     gitea)
         # tea pr merge syntax
-        CMD="tea pr merge $PR_NUMBER"
-
-        # tea merge style flags
-        case "$MERGE_METHOD" in
-            merge)   CMD="$CMD --style merge" ;;
-            squash)  CMD="$CMD --style squash" ;;
-            rebase)  CMD="$CMD --style rebase" ;;
-            *)
-                echo "Error: Invalid merge method '$MERGE_METHOD'" >&2
-                exit 1
-                ;;
-        esac
+        CMD="tea pr merge $PR_NUMBER --style squash"
 
         # Delete branch after merge if requested
         if [[ "$DELETE_BRANCH" == true ]]; then