mirror of
https://github.com/zebrajr/node.git
synced 2026-01-15 12:15:26 +00:00
9bd6d526e6
Most PRs are meant to be squashed in one commit when landing. If the collaborator hasn't been using `fixup!` commits, the CQ lands the PR as several commits. This change makes the CQ abort by default when attempting to land several commits, unless there's another label added to the PR to force squashing or landing as several commits. Fixes: https://github.com/nodejs/node/issues/40436 Refs: https://github.com/nodejs/node-core-utils/pull/572 PR-URL: https://github.com/nodejs/node/pull/40577 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
109 lines
3.1 KiB
Bash
Executable File
109 lines
3.1 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
set -xe
|
|
|
|
OWNER=$1
|
|
REPOSITORY=$2
|
|
GITHUB_TOKEN=$3
|
|
shift 3
|
|
|
|
UPSTREAM=origin
|
|
DEFAULT_BRANCH=master
|
|
|
|
API_URL=https://api.github.com
|
|
COMMIT_QUEUE_LABEL='commit-queue'
|
|
COMMIT_QUEUE_FAILED_LABEL='commit-queue-failed'
|
|
|
|
issueUrl() {
|
|
echo "$API_URL/repos/${OWNER}/${REPOSITORY}/issues/${1}"
|
|
}
|
|
|
|
labelsUrl() {
|
|
echo "$(issueUrl "${1}")/labels"
|
|
}
|
|
|
|
commentsUrl() {
|
|
echo "$(issueUrl "${1}")/comments"
|
|
}
|
|
|
|
gitHubCurl() {
|
|
url=$1
|
|
method=$2
|
|
shift 2
|
|
|
|
curl -fsL --request "$method" \
|
|
--url "$url" \
|
|
--header "authorization: Bearer ${GITHUB_TOKEN}" \
|
|
--header 'content-type: application/json' "$@"
|
|
}
|
|
|
|
commit_queue_failed() {
|
|
gitHubCurl "$(labelsUrl "${1}")" POST --data '{"labels": ["'"${COMMIT_QUEUE_FAILED_LABEL}"'"]}'
|
|
|
|
# shellcheck disable=SC2154
|
|
cqurl="${GITHUB_SERVER_URL}/${OWNER}/${REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
|
|
jq -n --arg content "<details><summary>Commit Queue failed</summary><pre>$(cat output)</pre><a href='$cqurl'>$cqurl</a></details>" '{body: $content}' > output.json
|
|
cat output.json
|
|
|
|
gitHubCurl "$(commentsUrl "${1}")" POST --data @output.json
|
|
|
|
rm output output.json
|
|
}
|
|
|
|
# TODO(mmarchini): should this be set with whoever added the label for each PR?
|
|
git config --local user.email "github-bot@iojs.org"
|
|
git config --local user.name "Node.js GitHub Bot"
|
|
|
|
for pr in "$@"; do
|
|
# Skip PR if CI was requested
|
|
if gitHubCurl "$(labelsUrl "$pr")" GET | jq -e 'map(.name) | index("request-ci")'; then
|
|
echo "pr ${pr} skipped, waiting for CI to start"
|
|
continue
|
|
fi
|
|
|
|
# Skip PR if CI is still running
|
|
if ncu-ci url "https://github.com/${OWNER}/${REPOSITORY}/pull/${pr}" 2>&1 | grep "^Result *PENDING"; then
|
|
echo "pr ${pr} skipped, CI still running"
|
|
continue
|
|
fi
|
|
|
|
# Delete the commit queue label
|
|
gitHubCurl "$(labelsUrl "$pr")"/"$COMMIT_QUEUE_LABEL" DELETE
|
|
|
|
if gitHubCurl "$(labelsUrl "$pr")" GET | jq -e 'map(.name) | index("commit-queue-squash")'; then
|
|
MULTIPLE_COMMIT_POLICY="--fixupAll"
|
|
elif gitHubCurl "$(labelsUrl "$pr")" GET | jq -e 'map(.name) | index("commit-queue-rebase")'; then
|
|
MULTIPLE_COMMIT_POLICY=""
|
|
else
|
|
MULTIPLE_COMMIT_POLICY="--oneCommitMax"
|
|
fi
|
|
|
|
git node land --autorebase --yes $MULTIPLE_COMMIT_POLICY "$pr" >output 2>&1 || echo "Failed to land #${pr}"
|
|
# cat here otherwise we'll be supressing the output of git node land
|
|
cat output
|
|
|
|
# TODO(mmarchini): workaround for ncu not returning the expected status code,
|
|
# if the "Landed in..." message was not on the output we assume land failed
|
|
if ! grep -q '. Post "Landed in .*/pull/'"${pr}" output; then
|
|
commit_queue_failed "$pr"
|
|
# If `git node land --abort` fails, we're in unknown state. Better to stop
|
|
# the script here, current PR was removed from the queue so it shouldn't
|
|
# interfere again in the future.
|
|
git node land --abort --yes
|
|
continue
|
|
fi
|
|
|
|
commits="$(git rev-parse $UPSTREAM/$DEFAULT_BRANCH)...$(git rev-parse HEAD)"
|
|
|
|
if ! git push $UPSTREAM $DEFAULT_BRANCH >> output 2>&1; then
|
|
commit_queue_failed "$pr"
|
|
continue
|
|
fi
|
|
|
|
rm output
|
|
|
|
gitHubCurl "$(commentsUrl "$pr")" POST --data '{"body": "Landed in '"$commits"'"}'
|
|
|
|
gitHubCurl "$(issueUrl "$pr")" PATCH --data '{"state": "closed"}'
|
|
done
|