Skip to content

tools: simplify and fix commit queue #40742

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

Merged
aduh95 merged 4 commits into from
Nov 7, 2021
Merged

tools: simplify and fix commit queue #40742

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4c662b
tools: use gh CLI for CI and commit queue jobs
targos Nov 6, 2021
bf2bbe1
Update .github/workflows/commit-queue.yml
targos Nov 6, 2021
aaca6bf
Update tools/actions/commit-queue.sh
targos Nov 6, 2021
4de4293
Update .github/workflows/commit-queue.yml
targos Nov 6, 2021
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
Prev Previous commit
Next Next commit
Update tools/actions/commit-queue.sh 
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
  • Loading branch information
@targos @aduh95
targos and aduh95 authored Nov 6, 2021
commit aaca6bfaa00ace0b8d54dd103063635428d7c7b1
5 changes: 4 additions & 1 deletion tools/actions/commit-queue.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ for pr in "$@"; do
--arg body "$(git log -1 --pretty='format:%b')" \
'{merge_method:"squash",commit_title:$title,commit_message:$body}' > output.json
cat output.json
gh api -X PUT "$(mergeUrl "$pr")" --input output.json > output
if ! gh api -X PUT "$(mergeUrl "$pr")" --input output.json > output; then
commit_queue_failed "$pr"
continue
fi
cat output
if ! commits="$(jq -r 'if .merged then .sha else error("not merged") end' < output)"; then
commit_queue_failed "$pr"
Expand Down