Merge branch 'master' into add-twir-reviewer

Author: nellshamrell

.github/CODEOWNERS

@@ -26,6 +26,7 @@
 /people/Nadrieril.toml @Mark-Simulacrum @pietroalbini @jdno @marcoieni
 /people/jackh726.toml @Mark-Simulacrum @pietroalbini @jdno @marcoieni
 /people/jdno.toml @Mark-Simulacrum @pietroalbini @jdno @marcoieni
+/people/jieyouxu.toml @Mark-Simulacrum @pietroalbini @jdno @marcoieni
 /people/marcoieni.toml @Mark-Simulacrum @pietroalbini @jdno @marcoieni
 /people/oli-obk.toml @Mark-Simulacrum @pietroalbini @jdno @marcoieni
 /people/pietroalbini.toml @Mark-Simulacrum @pietroalbini @jdno @marcoieni

README.md

@@ -1,7 +1,8 @@
 # Rust teams structure
 
-This repository contains the structure of the Rust teams. The repository is
-automatically synchronized with:
+This repository contains the structure of the Rust teams,
+and is used to manage permissions such as the ability to merge PRs.
+The repository is automatically synchronized with:
 
 | Service                                                    |  Synchronized every   |                                           |
 |------------------------------------------------------------|:---------------------:|-------------------------------------------|
@@ -46,7 +47,11 @@ from all the supported services.
 
 ## Documentation
 
+* [Threat model](docs/threat-model.md)
 * [TOML schema reference](docs/toml-schema.md)
+* [Team maintenance](https://forge.rust-lang.org/infra/team-maintenance.html).
+    * In particular, refer to [*Rules for changes to team repo*](https://forge.rust-lang.org/infra/team-maintenance.html#rules-for-changes-to-team-repo).
+* [Labels applied to issues and PRs](docs/labels.md)
 
 ## Using the CLI tool
 

config.toml

@@ -15,6 +15,12 @@ allowed-github-orgs = [
     "rust-analyzer",
 ]
 
+# GitHub organizations where member management is independent
+# and should not be automatically synchronized
+independent-github-orgs = [
+    "rust-embedded",
+]
+
 permissions-bors-repos = [
     "bors-kindergarten",
     "rust",
@@ -27,3 +33,28 @@ permissions-bools = [
     "dev-desktop",
     "sync-team-confirmation",
 ]
+
+# GitHub accounts that are allowed to stay in the GitHub organizations,
+# even if they may not be members of any team.
+# Note: Infra admins are automatically included from the infra-admins team.
+special-org-members = [
+    # Bots.
+    "bors",
+    "craterbot",
+    "rfcbot",
+    "rust-rfcbot",
+    "rust-embedded-bot",
+    "rust-heroku-deploy-access",
+    "rust-highfive",
+    "rust-lang-core-team-agenda-bot",
+    "rust-lang-glacier-bot",
+    "rust-lang-owner",
+    "rust-log-analyzer",
+    "rust-timer",
+    "rustbot",
+
+    # Ferrous systems employees who manage the github sponsors
+    # for rust-analyzer.
+    "MissHolmes",
+    "skade",
+]

docs/labels.md

@@ -0,0 +1,33 @@
+# Labels used in the `team` repository
+
+Some labels are setup to make it easier to figure out the status of an issue or PR, and allows
+contributors to filter issues/PRs by labels.
+
+## Labels are currently manually applied
+
+[`triagebot`][triagebot] is not currently set up for the `team` repository, as it would need write
+access (which needs to be tightly controlled). Thus, labels are currently manually applied and
+adjusted. See [threat model](./threat-model.md).
+
+## Meaning of labels
+
+- `needs-{team-repo,infra}-admin-review`: needs one of the [`infra-admins` or `team-repo-admins` or
+  one from both to review (and approve/reject)][team-repo-rules].
+- `needs-team-lead-review`: needs a relevant team or Working Group (WG) or Project Group (PG) lead
+  to approve.
+- Statuses:
+    - `S-waiting-on-{author,review,team}`: self-evident
+    - `S-has-concerns`: outstanding concerns that must be addressed
+    - `S-blocked`: blocked on *something*
+- Team labels: only `T-{infra,leadership-council}`, the latter is intended to help council members
+  to see what `team` PRs would need Council feedback or concerns the Council somehow.
+- `E-{easy,medium,hard}` and `E-help-wanted`: call-for-participation labels copied from
+  `rust-lang/rust`.
+- `needs-triage`: someone should try to figure out what the issue/PR needs/is/affects/is blocked on.
+- `needs-council-fcp`: something that requires the Council to FCP (outside `team` repo as rfcbot
+  isn't enabled).
+
+
+[triagebot]: https://forge.rust-lang.org/triagebot/index.html
+[team-repo-rules]:
+    https://forge.rust-lang.org/infra/team-maintenance.html#rules-for-changes-to-team-repo

docs/toml-schema.md

@@ -368,6 +368,10 @@ Admins cannot override these branch protections. If an admin needs to do that, t
 pattern = "master"
 # Which CI checks to are required for merging (optional)
 # Cannot be set if `pr-required` is `false`.
+#
+# For regular GitHub Actions, this is the name of the *job* that is required,
+# not the name of the workflow or the workflow filename. The name of the job
+# defaults to its YAML key name, or can be overridden with the `name` field.
 ci-checks = ["CI"]
 # Whether new commits after a reviewer's approval of a PR
 # merging into this branch require another review.

people/AndyGauge.toml

@@ -0,0 +1,5 @@
+name = "Andrew Gauger"
+github = "AndyGauge"
+github-id = 6525150
+zulip-id = 257582
+email = "[email protected]"

people/KannanPalani57.toml

@@ -0,0 +1,4 @@
+name = "Kannan Palani"
+github = "KannanPalani57"
+github-id = 45064864
+email = "[email protected]"

people/LoriLorusso.toml

@@ -0,0 +1,5 @@
+name = "Lori Lorusso"
+github = "LoriLorusso"
+github-id = 66495765
+zulip-id = 944316
+email = "[email protected]"

people/MerrimanInd.toml

@@ -0,0 +1,5 @@
+name = "Xander Cesari"
+github = "MerrimanInd"
+github-id = 38871383
+zulip-id = 880880
+email = "[email protected]"

people/Osintedx.toml

@@ -0,0 +1,5 @@
+name = 'Taylor'
+github = 'Osintedx'
+github-id = 88603393
+email = '[email protected]'
+zulip-id = 951106