Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: add util scripts to land and rebase PRs #54656

Merged
merged 5 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions tools/actions/merge.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/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>`.

set -xe

pr=$1
commit_head=$2
shift 2 || (echo "Expected two arguments" && exit 1)
aduh95 marked this conversation as resolved.
Show resolved Hide resolved

commit_queue_failed() {
pr=$1

echo "Failed to merge $pr"
cat output
LiviaMedeiros marked this conversation as resolved.
Show resolved Hide resolved

rm output
LiviaMedeiros marked this conversation as resolved.
Show resolved Hide resolved
}

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 }')"
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

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" && 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
aduh95 marked this conversation as resolved.
Show resolved Hide resolved

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

jq -n \
--arg title "${commit_title}" \
--arg body "${commit_body}" \
--arg head "${commit_head}" \
'{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json
cat output.json
if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then
commit_queue_failed "$pr"
exit 1
fi
cat output
if ! commits="$(jq -r 'if .merged then .sha else error("not merged") end' < output)"; then
commit_queue_failed "$pr"
exit 1
fi
rm output.json output

gh pr comment "$pr" --body "Landed in $commits"
aduh95 marked this conversation as resolved.
Show resolved Hide resolved
11 changes: 11 additions & 0 deletions tools/actions/rebase.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

set -xe

# shellcheck disable=SC2016
gh api graphql -F "prID=$(gh pr view "$1" --json id --jq .id || true)" -f query='
mutation RebasePR($prID: ID!) {
updatePullRequestBranch(input:{pullRequestId:$prID,updateMethod:REBASE}) {
clientMutationId
}
}'
Loading