Skip to content

chore(scripts): check PR mergeable state before merging #12219

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
jinseopkim0 merged 2 commits into from
Mar 27, 2026
+23 −2
Merged

chore(scripts): check PR mergeable state before merging #12219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8119995
chore(scripts): check PR mergeable state before merging
jinseopkim0 Mar 26, 2026
6c2ce60
Merge branch 'main' into merge_bot
jinseopkim0 Mar 27, 2026
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
Binary file modified .github/scripts/release_manager_merge_bot
View file
Open in desktop
Binary file not shown.
25 changes: 23 additions & 2 deletions .github/scripts/release_manager_merge_bot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,16 @@ func main() {
}

state = *status.State
log.Printf("Overall status: %s", state)
log.Printf("Overall commit status: %s", state)
if pr.MergeableState != nil {
log.Printf("PR mergeable state: %s", *pr.MergeableState)
if *pr.MergeableState == "dirty" {
fatalError("PR #%d has merge conflicts (dirty).", prNumber)
}
if *pr.MergeableState == "draft" {
fatalError("PR #%d is a draft.", prNumber)
}
}

switch state {
case "failure":
Expand All @@ -230,7 +239,19 @@ func main() {
}
retryCount++
case "success":
log.Println("All checks have passed. Merging the pull request...")
// Check if the PR is truly mergeable. MergeableState can be "blocked" if required
// check runs (e.g. GitHub Actions) or reviews are missing, even if CombinedStatus is "success".
// If it's nil, GitHub is still calculating mergeability.
if pr.MergeableState == nil || *pr.MergeableState == "blocked" || *pr.MergeableState == "behind" {
stateStr := "nil"
if pr.MergeableState != nil {
stateStr = *pr.MergeableState
}
log.Printf("Commit status is success, but PR mergeable state is %q. Waiting...", stateStr)
goto wait
}

log.Println("All checks have passed and PR is mergeable. Merging the pull request...")
commitMessage := fmt.Sprintf("Merge pull request #%d from %s/%s", prNumber, owner, repo)
mergeResult, _, err := client.PullRequests.Merge(ctx, owner, repo, prNumber, commitMessage, &github.PullRequestOptions{
MergeMethod: "squash",
Expand Down
Loading