archive/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-08-15 13:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

tools: add support for URLs to PR commits in merge.sh

Browse source 
PR-URL: https://github.com/nodejs/node/pull/59162
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
This commit is contained in:
Antoine du Hamel 2025-07-24 11:44:33 +02:00 • committed by GitHub
parent 09382114c0
commit 38c2b926af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tools/actions/merge.sh
View file

@ -6,13 +6,12 @@
# To land a PR with this tool: # To land a PR with this tool:
# 1. Run `git node land <pr-id-or-url> --fixupAll` # 1. Run `git node land <pr-id-or-url> --fixupAll`
# 2. Copy the hash of the commit at the top of the PR branch. # 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>`. # 3. Run `tools/actions/merge.sh <pr-id-or-url> <commit-hash>` or `tools/actions/merge.sh <url-to-PR-commit>`.
set -xe set -xe
pr=$1 pr=$1
commit_head=$2 commit_head=$2
shift 2 || { echo "Expected two arguments"; exit 1; }
OWNER=nodejs OWNER=nodejs
REPOSITORY=node REPOSITORY=node
@ -20,11 +19,33 @@ REPOSITORY=node
if expr "X$pr" : 'Xhttps://github.com/[^/]\{1,\}/[^/]\{1,\}/pull/[0-9]\{1,\}' >/dev/null; then if expr "X$pr" : 'Xhttps://github.com/[^/]\{1,\}/[^/]\{1,\}/pull/[0-9]\{1,\}' >/dev/null; then
OWNER="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $4 }')" OWNER="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $4 }')"
REPOSITORY="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $5 }')" 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 }')" pr="$(echo "$pr" | awk 'BEGIN { FS = "/" } ; { print $7 }')"
elif ! expr "X$pr" : 'X[0-9]\{1,\}' >/dev/null; then
echo "The first argument should be the PR ID or URL"
fi 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 | \ 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$" || { grep -q -x "^PR-URL: https://github.com/$OWNER/$REPOSITORY/pull/$pr$" || {
echo "Invalid PR-URL trailer" echo "Invalid PR-URL trailer"