Merge pull request #372 from rust-lang/infra-bors-rs

Add the infrastructure team to the bors-rs organization

Author: pietroalbini

config.toml

@@ -6,6 +6,7 @@ allowed-mailing-lists-domains = [
 ]
 
 allowed-github-orgs = [
+    "bors-rs",
     "rust-lang",
     "rust-lang-ci",
     "rust-lang-nursery",

src/schema.rs

@@ -120,7 +120,8 @@ pub(crate) struct Team {
     people: TeamPeople,
     #[serde(default)]
     permissions: Permissions,
-    github: Option<GitHubData>,
+    #[serde(default)]
+    github: Vec<GitHubData>,
     rfcbot: Option<RfcbotData>,
     website: Option<WebsiteData>,
     #[serde(default)]
@@ -243,7 +244,8 @@ impl Team {
     }
 
     pub(crate) fn github_teams<'a>(&'a self, data: &Data) -> Result<Vec<GitHubTeam<'a>>, Error> {
-        if let Some(github) = &self.github {
+        let mut result = Vec::new();
+        for github in &self.github {
             let mut members = self
                 .members(data)?
                 .iter()
@@ -258,19 +260,18 @@ impl Team {
                         .filter_map(|name| data.person(name).map(|p| p.github_id())),
                 );
             }
+            members.sort();
             let name = github.team_name.as_deref().unwrap_or(&self.name);
-            Ok(github
-                .orgs
-                .iter()
-                .map(|org| GitHubTeam {
+
+            for org in &github.orgs {
+                result.push(GitHubTeam {
                     org: org.as_str(),
                     name,
                     members: members.clone(),
-                })
-                .collect())
-        } else {
-            Ok(Vec::new())
+                });
+            }
         }
+        Ok(result)
     }
 }
 

teams/cargo.toml

@@ -14,7 +14,7 @@ members = [
 bors.rust.review = true
 bors.cargo.review = true
 
-[github]
+[[github]]
 orgs = ["rust-lang", "rust-lang-nursery"]
 
 [rfcbot]

teams/clippy.toml

@@ -19,7 +19,7 @@ members = [
 [permissions]
 bors.clippy.review = true
 
-[github]
+[[github]]
 orgs = ["rust-lang"]
 
 [website]

teams/community-content.toml

@@ -20,5 +20,5 @@ repo = "https://github.com/rust-community/content-team"
 discord-invite = "https://discord.gg/b7a22kw"
 discord-name = "#content-team"
 
-[github]
+[[github]]
 orgs = ["rust-lang"]

teams/community-events.toml

@@ -20,5 +20,5 @@ repo = "https://github.com/rust-community/events-team"
 discord-invite = "https://discord.gg/cj5HMXA"
 discord-name = "#events"
 
-[github]
+[[github]]
 orgs = ["rust-lang"]

teams/community-localization.toml

@@ -20,7 +20,7 @@ name = "Localization team"
 description = "Working on localization of compiler, documentation and websites"
 repo = "https://github.com/rust-lang/community-localization"
 
-[github]
+[[github]]
 orgs = ["rust-lang"]
 
 [[lists]]

teams/community-rustbridge.toml

@@ -20,5 +20,5 @@ repo = "https://github.com/rustbridge/team"
 discord-invite = "https://discord.gg/cj5HMXA"
 discord-name = "#rustbridge"
 
-[github]
+[[github]]
 orgs = ["rust-lang"]

teams/community-survey.toml

@@ -11,5 +11,5 @@ members = [
 name = "Survey team"
 description = "Running, analysing, and presenting the community survey"
 
-[github]
+[[github]]
 orgs = ["rust-lang"]

teams/community.toml

@@ -24,7 +24,7 @@ repo = "https://github.com/rust-community/team"
 discord-invite = "https://discord.gg/KskHZGT"
 discord-name = "#community-team"
 
-[github]
+[[github]]
 orgs = ["rust-lang"]
 
 [[lists]]