Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions pkg/tide/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,11 @@ func (m *mergeChecker) isAllowedToMerge(crc *CodeReviewCommon) (string, error) {
} else if !allowed {
return fmt.Sprintf("Merge type %q disallowed by repo settings", *mergeMethod), nil
}
// Check GitHub's mergeStateStatus which reflects all GitHub-side merge blocking conditions
// including branch protection rules, rulesets, required reviews, status checks, etc.
if pr.MergeStateStatus == "BLOCKED" {
return "PR is blocked from merging by GitHub (check branch protection, required reviews, or rulesets)", nil
}
return "", nil
}

Expand Down
8 changes: 7 additions & 1 deletion pkg/tide/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,19 @@ func requirementDiff(pr *PullRequest, q *config.TideQuery, cc contextChecker) (s
desc = fmt.Sprintf(" Jobs %s have not succeeded.", strings.Join(trunced, ", "))
}
}

if q.ReviewApprovedRequired && pr.ReviewDecision != githubql.PullRequestReviewDecisionApproved {
diff += 50
if desc == "" {
desc = " PullRequest is missing sufficient approving GitHub review(s)"
}
}
// Check GitHub's mergeStateStatus which reflects all GitHub-side blocking conditions
if pr.MergeStateStatus == "BLOCKED" {
diff += 100
if desc == "" {
desc = " Blocked by GitHub (branch rulesets or protection)"
}
}
return desc, diff
}

Expand Down
Loading