diff --git a/src/doc/contrib/src/team.md b/src/doc/contrib/src/team.md index 10b4a82645d..538ebe07a88 100644 --- a/src/doc/contrib/src/team.md +++ b/src/doc/contrib/src/team.md @@ -61,7 +61,7 @@ Members are given privileges, such as: The primary focus of team meetings is for unblocking designs, including discussing - [RFCs][t-cargo-rfcs] - [FCPs][cargo-status-tracker] -- [Items marked **I-nominated-to-discuss**][i-nominated] +- [Items marked **I-nominated-to-discuss**][i-nominated] or [**I-cargo-nominated** on `rust-lang/rust`][i-cargo-nominated] - [Items marked **S-needs-team-input**][s-team-input] - Topics proposed on [Zulip][zulip-meeting], subject to availability @@ -69,13 +69,14 @@ Generally, topics for the agenda should be posted a day in advance to give peopl The team meets on a weekly basis ([ics][meeting-ics]) on a video chat. Members of the community are welcome to attend. -Minutes for all meetings are recorded on [HackMD][meeting-minutes]. +Minutes for all meetings are recorded on [HackMD][meeting-minutes]. After the meeting, meeting notes are permanently recorded in . For discussing contributions, [Office Hours](process/index.md#mentorship) would be more appropriate venue. [t-cargo-rfcs]: https://github.com/rust-lang/rfcs/pulls?q=is%3Apr+is%3Aopen+label%3AT-cargo [cargo-status-tracker]: https://github.com/orgs/rust-lang/projects/47 [i-nominated]: https://github.com/rust-lang/cargo/labels/I-nominated-to-discuss +[i-cargo-nominated]: https://github.com/rust-lang/rust/issues?q=label%3AI-cargo-nominated [s-team-input]: https://github.com/rust-lang/cargo/labels/S-needs-team-input [meeting-ics]: https://rust-lang.github.io/calendar/cargo/team-meeting.ics [meeting-minutes]: https://hackmd.io/@rust-cargo-team?tags=%5B%22meetings%22%5D @@ -93,6 +94,20 @@ Members may leave at any time, preferably by letting the team know ahead of time ## Team resources +### GitHub + +The Cargo team has various permissions on GitHub: + +- [`rust-lang/cargo`](https://github.com/rust-lang/cargo) --- The primary repository for Cargo development. +- [`rust-lang/cargo-team`](https://github.com/rust-lang/cargo-team) --- The repository for the Cargo team, primarily hosting meeting notes. +- [`rust-lang/rust`](https://github.com/rust-lang/rust) --- The primary repository for Rust releases. The cargo team has "write" permission, and also permission to approve merges via [bors](https://bors.rust-lang.org/) (primarily for [submodule updates]). +- [`rust-lang/annotate-snippets-rs`](https://github.com/rust-lang/annotate-snippets-rs) --- The diagnostic formatting library shared between `rustc` and `cargo`. +- [`rust-lang/git2-rs`](https://github.com/rust-lang/annotate-snippets-rs) --- The bindings to the libgit2 library used by `cargo`. +- [`rust-lang/jobserver-rs`](https://github.com/rust-lang/jobserver-rs) --- The jobserver library. +- [`rust-lang/wg-cargo-std-aware`](https://github.com/rust-lang/wg-cargo-std-aware) --- Repository used to coordinate the efforts to support building `std` with cargo. + +[submodule updates]: process/release.md#submodule-updates + ### Zulip The Cargo team has several streams on Zulip: @@ -112,6 +127,21 @@ The Cargo team has a shared, public workspace on HackMD at