tools/actions/merge.sh - main - githubmirror/node

tools/actions/merge.sh
73 строки3 KB
Stewart X Addison
tools: reference 'git node land' in PR-URL: error message in merge.sh
16 июл 2026, 21:13
16 июл 2026, 21:1361b8e12
#!/bin/sh

# Requires [gh](https://cli.github.com/), [jq](https://jqlang.github.io), git, and grep. Also awk if you pass a URL.

# This script can be used to "purple-merge" PRs that are supposed to land as a single commit, using the "Squash and Merge" feature of GitHub.
# To land a PR with this tool:
# 1. Run `git node land <pr-id-or-url> --fixupAll`
# 2. Copy the hash of the commit at the top of the PR branch.
# 3. Run `tools/actions/merge.sh <pr-id-or-url> <commit-hash>` or `tools/actions/merge.sh <url-to-PR-commit>`.

set -xe

pr=$1
commit_head=$2

OWNER=nodejs
REPOSITORY=node

if expr "X$pr" : 'Xhttps://github.com/[^/]\{1,\}/[^/]\{1,\}/pull/[0-9]\{1,\}' >/dev/null; then
  OWNER="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $4 }')"
  REPOSITORY="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $5 }')"
  [ -n "$commit_head" ] || commit_head="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $9 }')"
  pr="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $7 }')"
fi

validation_error=
if ! expr "X${pr}X" : 'X[0-9]\{1,\}X' >/dev/null; then
  set +x
  echo "Invalid PR ID: $pr"
  validation_error=1
fi
if ! expr "X${commit_head}X" : 'X[a-f0-9]\{40\}X' >/dev/null; then
  set +x
  echo "Invalid PR head: $commit_head"
  validation_error=1
fi
[ -z "$validation_error" ] || {
  echo 'Usage:'
  printf '\t%s <pr-id-or-url> <commit-hash>\n' "$0"
  echo 'or:'
  printf '\t%s <url-to-PR-commit>\n' "$0"
  echo 'Examples:'
  printf '\t%s 12345 aaaaabbbbbcccccdddddeeeeefffff1111122222\n' "$0"
  printf '\t%s https://github.com/%s/pull/12345 aaaaabbbbbcccccdddddeeeeefffff1111122222\n' "$0" "$OWNER/$REPOSITORY"
  printf '\t%s https://github.com/%s/pull/12345/commits/aaaaabbbbbcccccdddddeeeeefffff1111122222\n' "$0" "$OWNER/$REPOSITORY"
  exit 1
}

git log -1 HEAD  --pretty='format:%B' | git interpret-trailers --parse --no-divider | \
  grep -q -x "^PR-URL: https://github.com/$OWNER/$REPOSITORY/pull/$pr$" || {
    echo "Invalid PR-URL trailer - have you run 'git node land' to add it?"
    exit 1
  }
git log -1 HEAD^ --pretty='format:%B' | git interpret-trailers --parse --no-divider | \
  grep -q -x "^PR-URL: https://github.com/$OWNER/$REPOSITORY/pull/$pr$" && {
    echo "Refuse to squash and merge a PR landing in more than one commit"
    exit 1
  }

commit_title=$(git log -1 --pretty='format:%s')
commit_body=$(git log -1 --pretty='format:%b')

commitSHA="$(
  jq -cn \
    --arg title "${commit_title}" \
    --arg body "${commit_body}" \
    --arg head "${commit_head}" \
    '{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' |\
  gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input -\
    --jq 'if .merged then .sha else halt_error end'
)"

gh pr comment "$pr" --repo "$OWNER/$REPOSITORY" --body "Landed in $commitSHA"