#!/bin/bash # pr-merge.sh - Merge pull requests on Gitea or GitHub # Usage: pr-merge.sh -n PR_NUMBER [-m squash] [-d] [--skip-queue-guard] set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" source "$SCRIPT_DIR/detect-platform.sh" # Default values PR_NUMBER="" MERGE_METHOD="squash" DELETE_BRANCH=false SKIP_QUEUE_GUARD=false usage() { cat <&2 usage ;; esac done if [[ -z "$PR_NUMBER" ]]; then echo "Error: PR number is required (-n)" >&2 usage fi if [[ ! "$PR_NUMBER" =~ ^[0-9]+$ ]]; then echo "Error: PR number must be numeric." >&2 exit 1 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) OWNER=$(get_repo_owner) REPO=$(get_repo_name) case "$PLATFORM" in github) CMD=(gh pr merge "$PR_NUMBER" --squash) [[ "$DELETE_BRANCH" == true ]] && CMD+=(--delete-branch) "${CMD[@]}" ;; gitea) HOST=$(get_remote_host) || { echo "Error: Could not determine remote host." >&2 exit 1 } CMD=(tea pr merge "$PR_NUMBER" --style squash --repo "$OWNER/$REPO") GITEA_TEA_LOGIN=$(get_gitea_login "$HOST" || true) if [[ -n "$GITEA_TEA_LOGIN" ]]; then if [[ ! "$GITEA_TEA_LOGIN" =~ ^[A-Za-z0-9._-]+$ ]]; then echo "Error: Gitea tea login contains unsupported characters." >&2 exit 1 fi CMD+=(--login "$GITEA_TEA_LOGIN") fi # Delete branch after merge if requested if [[ "$DELETE_BRANCH" == true ]]; then echo "Note: Branch deletion after merge may need to be done separately with tea" >&2 fi "${CMD[@]}" ;; *) echo "Error: Could not detect git platform" >&2 exit 1 ;; esac echo "PR #$PR_NUMBER merged successfully"