Skip to content
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.

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

Require 2/3 majority for FCP #315

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
8 changes: 4 additions & 4 deletions src/github/nag.rs
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ fn evaluate_pendings() -> DashResult<()> {
proposal.id, why));
}

let majority_complete = num_outstanding_reviews < num_complete_reviews;
let majority_complete = num_outstanding_reviews <= 2 * num_complete_reviews;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems wrong: with 2 complete reviews and 4 outstanding reviews, this evaluates to true. ^^

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, the multiplication should be on the left-hand side.^^


if num_active_concerns == 0 && majority_complete && num_outstanding_reviews < 3 {
// TODO only record the fcp as started if we know that we successfully commented
Expand Down Expand Up @@ -1197,9 +1197,9 @@ impl<'a> RfcBotComment<'a> {
}
}

msg.push_str("\nOnce a majority of reviewers approve (and at most 2 approvals are outstanding), ");
msg.push_str("this will enter its final comment period. ");
msg.push_str("If you spot a major issue that hasn't been raised ");
msg.push_str("\nOnce two thirds of reviewers approve (and at most 2 ");
msg.push_str("approvals are outstanding), this will enter its final comment ");
msg.push_str("period. If you spot a major issue that hasn't been raised ");
msg.push_str("at any point in this process, please speak up!\n");

if issue.labels.iter().any(|l| l == "T-lang") {
Expand Down