Add a branch protection option to choose required approval count

docs/toml-schema.md

@@ -292,4 +292,8 @@ ci-checks = ["CI"]
 # merging into this branch require another review. 
 # (optional - default `false`)
 dismiss-stale-review = false
+# How many approvals are required for a PR to be merged.
+# This option is only relevant if bors is not used.
+# (optional - default `1`)
+required-approvals = 1
 ```

rust_team_data/src/v1.rs

@@ -186,6 +186,7 @@ pub struct BranchProtection {
     pub pattern: String,
     pub ci_checks: Vec<String>,
     pub dismiss_stale_review: bool,
+    pub required_approvals: u32,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/schema.rs

@@ -733,4 +733,6 @@ pub(crate) struct BranchProtection {
     pub ci_checks: Vec<String>,
     #[serde(default)]
     pub dismiss_stale_review: bool,
+    #[serde(default)]
+    pub required_approvals: Option<u32>,
 }

src/static_api.rs

@@ -43,6 +43,7 @@ impl<'a> Generator<'a> {
                     pattern: b.pattern.clone(),
                     ci_checks: b.ci_checks.clone(),
                     dismiss_stale_review: b.dismiss_stale_review,
+                    required_approvals: b.required_approvals.unwrap_or(1),
                 })
                 .collect();
             let repo = v1::Repo {

src/validate.rs

@@ -1,6 +1,6 @@
 use crate::data::Data;
 use crate::github::GitHubApi;
-use crate::schema::{Email, Permissions, Team, TeamKind, TeamPeople, ZulipGroupMember};
+use crate::schema::{Bot, Email, Permissions, Team, TeamKind, TeamPeople, ZulipGroupMember};
 use crate::zulip::ZulipApi;
 use anyhow::{bail, Error};
 use log::{error, warn};
@@ -44,6 +44,7 @@ static CHECKS: &[Check<fn(&Data, &mut Vec<String>)>] = checks![
     validate_zulip_group_ids,
     validate_zulip_group_extra_people,
     validate_repos,
+    validate_branch_protections,
 ];
 
 #[allow(clippy::type_complexity)]
@@ -774,6 +775,24 @@ fn validate_repos(data: &Data, errors: &mut Vec<String>) {
     });
 }
 
+/// Validate that branch protections make sense in combination with used bots.
+fn validate_branch_protections(data: &Data, errors: &mut Vec<String>) {
+    wrapper(data.repos(), errors, |repo, _| {
+        let bors_used = repo.bots.iter().any(|b| matches!(b, Bot::Bors));
+        for protection in &repo.branch_protections {
+            if bors_used && protection.required_approvals.is_some() {
+                bail!(
+                    r#"repo '{}' uses bors and its branch protection for {} uses the `required-approvals` attribute;
+please remove the attribute when using bors"#,
+                    repo.name,
+                    protection.pattern,
+                );
+            }
+        }
+        Ok(())
+    })
+}
+
 fn wrapper<T, I, F>(iter: I, errors: &mut Vec<String>, mut func: F)
 where
     I: Iterator<Item = T>,

tests/static-api/_expected/v1/repos.json

@@ -18,7 +18,8 @@
           "ci_checks": [
             "CI"
           ],
-          "dismiss_stale_review": false
+          "dismiss_stale_review": false,
+          "required_approvals": 1
         }
       ]
     }

tests/static-api/_expected/v1/repos/some_repo.json

@@ -16,7 +16,8 @@
       "ci_checks": [
         "CI"
       ],
-      "dismiss_stale_review": false
+      "dismiss_stale_review": false,
+      "required_approvals": 1
     }
   ]
 }