Merge pull request #1828 from Kobzol/try-perf-rust

Add support for `rust-timer` merge bot and `try-perf`/`perf-tmp` branch protections

Author: marcoieni

repos/rust-lang/rust.toml

@@ -38,14 +38,6 @@ merge-bots = ["homu"]
 pattern = "beta"
 merge-bots = ["homu"]
 
-[[branch-protections]]
-pattern = "try"
-merge-bots = ["homu"]
-
-[[branch-protections]]
-pattern = "auto"
-merge-bots = ["homu"]
-
 [[branch-protections]]
 pattern = "*"
 merge-bots = ["homu"]
@@ -65,3 +57,27 @@ pr-required = false
 [[branch-protections]]
 pattern = "automation/bors/try"
 pr-required = false
+
+# Required for running try builds created by homu.
+# Must support force-pushes.
+[[branch-protections]]
+pattern = "try"
+merge-bots = ["homu"]
+
+# Required for running auto (merge) builds created by homu.
+# Must support force-pushes.
+[[branch-protections]]
+pattern = "auto"
+merge-bots = ["homu"]
+
+# Required for unrolled PR builds created by perfbot.
+# Must support force-pushes.
+[[branch-protections]]
+pattern = "try-perf"
+merge-bots = ["rust-timer"]
+
+# Required for unrolled PR builds created by perfbot.
+# Must support force-pushes.
+[[branch-protections]]
+pattern = "perf-tmp"
+merge-bots = ["rust-timer"]

rust_team_data/src/v1.rs

@@ -246,6 +246,7 @@ pub enum BranchProtectionMode {
 #[serde(rename_all = "snake_case")]
 pub enum MergeBot {
     Homu,
+    RustTimer,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]

src/schema.rs

@@ -870,6 +870,7 @@ pub(crate) enum RepoPermission {
 #[serde(rename_all = "kebab-case")]
 pub(crate) enum MergeBot {
     Homu,
+    RustTimer,
 }
 
 #[derive(serde_derive::Deserialize, Debug)]

src/static_api.rs

@@ -66,6 +66,7 @@ impl<'a> Generator<'a> {
                         .iter()
                         .map(|bot| match bot {
                             MergeBot::Homu => v1::MergeBot::Homu,
+                            MergeBot::RustTimer => v1::MergeBot::RustTimer,
                         })
                         .collect(),
                 })

sync-team/src/github/mod.rs

@@ -512,10 +512,10 @@ pub fn construct_branch_protection(
     expected_repo: &rust_team_data::v1::Repo,
     branch_protection: &rust_team_data::v1::BranchProtection,
 ) -> api::BranchProtection {
-    let uses_homu = branch_protection.merge_bots.contains(&MergeBot::Homu);
-    // When homu manages a branch, we should not require a PR nor approvals
-    // for that branch, because homu pushes to these branches directly.
-    let branch_protection_mode = if uses_homu {
+    let uses_merge_bot = !branch_protection.merge_bots.is_empty();
+    // When a merge bot manages a branch, we should not require a PR nor approvals
+    // for that branch, because it will (force) push to these branches directly.
+    let branch_protection_mode = if uses_merge_bot {
         BranchProtectionMode::PrNotRequired
     } else {
         branch_protection.mode.clone()
@@ -542,10 +542,16 @@ pub fn construct_branch_protection(
         })
         .collect();
 
-    if uses_homu {
-        push_allowances.push(PushAllowanceActor::User(api::UserPushAllowanceActor {
-            login: "bors".to_owned(),
-        }));
+    for merge_bot in &branch_protection.merge_bots {
+        let allowance = match merge_bot {
+            MergeBot::Homu => PushAllowanceActor::User(api::UserPushAllowanceActor {
+                login: "bors".to_owned(),
+            }),
+            MergeBot::RustTimer => PushAllowanceActor::User(api::UserPushAllowanceActor {
+                login: "rust-timer".to_owned(),
+            }),
+        };
+        push_allowances.push(allowance);
     }
 
     let mut checks = match &branch_protection_mode {