Skip to content

tide: changes requested block merge when branch protection requires reviews #537

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+539 −5
Open

tide: changes requested block merge when branch protection requires reviews #537

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions pkg/tide/github.go
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,13 @@ func requirementDiff(pr *PullRequest, q *config.TideQuery, cc contextChecker) (s
}
}

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