Skip to content

Use gh pr merge --auto so the nightly bot waits for required checks #1302

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

Closed
escherize wants to merge 1 commit into from
Closed

Use gh pr merge --auto so the nightly bot waits for required checks #1302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions script/merge.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,22 @@
;; Wait a bit for GitHub to process to avoid a race condition
(Thread/sleep 5000)

;; Merge the PR
;; Merge the PR. With branch protection on master, --auto queues the merge
;; until required status checks pass instead of failing on pending checks.
;; If auto-merge is unavailable (eg. no branch protection), fall back to an
;; immediate merge, which is the pre-protection behavior.
(ice/p [:blue "Merging PR #" pr-number "..."])
(let [merge-result (p/sh {:continue true}
"gh" "pr" "merge" (str pr-number)
"--squash" "--delete-branch"
"--repo" "metabase/docs.metabase.github.io")]
(let [gh-merge (fn [& extra-args]
(apply p/sh {:continue true}
"gh" "pr" "merge" (str pr-number)
"--squash" "--delete-branch"
"--repo" "metabase/docs.metabase.github.io"
extra-args))
auto-result (gh-merge "--auto")
merge-result (if (zero? (:exit auto-result))
auto-result
(do (ice/p [:yellow "Auto-merge unavailable (" (str/trim (str (:err auto-result))) "), merging directly..."])
(gh-merge)))]
(if (zero? (:exit merge-result))
(ice/p [:green "✓ PR merged successfully!"])
(ice/p [:red "✗ Merge failed: " [:bold (:err merge-result)]]))))
Expand Down