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.

Sign up for GitHub

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

Jump to bottom

build: fix landed message for multiple commits in commit-queue #35226

Closed
wants to merge 2 commits into from
Closed

build: fix landed message for multiple commits in commit-queue #35226

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cc188b
build: fix landed message for multiple commits in commit-queue
lundibundi Sep 16, 2020
10a2f5b
fixup! build: fix landed message for multiple commits in commit-queue
lundibundi Sep 16, 2020
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
8 changes: 6 additions & 2 deletions tools/actions/commit-queue.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ 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'
Expand Down Expand Up @@ -76,9 +79,10 @@ for pr in "$@"; do
git node land --abort --yes
else
rm output
git push origin master
git push $UPSTREAM $DEFAULT_BRANCH

gitHubCurl "$(commentsUrl "$pr")" POST --data '{"body": "Landed in '"$(git rev-parse HEAD)"'"}'
commits="$(git merge-base $UPSTREAM/$DEFAULT_BRANCH HEAD)...$(git rev-parse HEAD)"
lundibundi marked this conversation as resolved.
Show resolved Hide resolved
gitHubCurl "$(commentsUrl "$pr")" POST --data '{"body": "Landed in '"$commits"'"}'

gitHubCurl "$(issueUrl "$pr")" PATCH --data '{"state": "closed"}'
fi
Expand Down