Skip to content

Add all teams to the website #1691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/toml-schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ ping = "rust-lang/cargo"
# Team members to be excluded from FCPs
exclude-members = ["some-team-member"]

# Information about the team to display on the www.rust-lang.org website.
# Information about the team to display on the www.rust-lang.org website (required except marker teams).
[website]
# The name of the team to display on the website (required).
name = "Language team"
Expand Down
14 changes: 14 additions & 0 deletions src/validate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ static CHECKS: &[Check<fn(&Data, &mut Vec<String>)>] = checks![
validate_repos,
validate_branch_protections,
validate_member_roles,
validate_website,
];

#[allow(clippy::type_complexity)]
Expand Down Expand Up @@ -1040,3 +1041,16 @@ where
}
}
}

fn validate_website(data: &Data, errors: &mut Vec<String>) {
wrapper(data.teams(), errors, |team, _| {
match team.kind() {
TeamKind::MarkerTeam => return Ok(()),
TeamKind::Team | TeamKind::WorkingGroup | TeamKind::ProjectGroup => {}
};
if team.website_data().is_none() {
bail!("team `{}` should have a `[website]` table", team.name());
}
Ok(())
})
}
5 changes: 5 additions & 0 deletions teams/book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@ alumni = []

[[github]]
orgs = ["rust-lang"]

[website]
name = "Book team"
description = "Maintains The Rust Programming Language book"
repo = "https://github.com/rust-lang/book"
5 changes: 5 additions & 0 deletions teams/codegen-c-maintainers.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@ alumni = []

[[github]]
orgs = ["rust-lang"]

[website]
name = "Codegen C Maintainers"
description = "Developing the C based backend for rustc"
repo = "https://github.com/rust-lang/rustc_codegen_c"
5 changes: 5 additions & 0 deletions teams/community.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,8 @@ extra-people = [
[[discord-roles]]
name = "community-team"
color = "#c27c0e"

[website]
name = "Community team"
description = "Engagement with the Rust community"
repo = "https://github.com/rust-community/team"
6 changes: 6 additions & 0 deletions teams/compiler-fcp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ alumni = []
label = "T-compiler"
name = "Compiler"
ping = "rust-lang/compiler-fcp"

[website]
name = "Compiler FCP team"
description = "Compiler team members with responsibility for signing off on major compiler changes"
repo = "http://github.com/rust-lang/compiler-team"
zulip-stream = "t-compiler"
5 changes: 5 additions & 0 deletions teams/docker.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,8 @@ alumni = []

[[github]]
orgs = ["rust-lang"]

[website]
name = "Docker team"
description = "Maintains the official Docker images published to Docker Hub"
repo = "https://github.com/rust-lang/docker-rust/"
6 changes: 6 additions & 0 deletions teams/docs-rs-reviewers.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ alumni = [

[[github]]
orgs = ["rust-lang"]

[website]
name = "Docs.rs reviewers"
description = "Docs.rs team members responsible for reviews"
repo = "https://github.com/rust-lang/docs.rs"
zulip-stream = "t-docs-rs"
5 changes: 5 additions & 0 deletions teams/infra-bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ alumni = []

[[github]]
orgs = ["rust-lang"]

[website]
name = "Bors team"
description = "Develops the bors merge bot"
repo = "https://github.com/rust-lang/bors"
4 changes: 4 additions & 0 deletions teams/mentors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ alumni = []

[[zulip-groups]]
name = "gsoc-mentors"

[website]
name = "Mentors team"
description = "Mentors for the mentorship and internship programs"
6 changes: 6 additions & 0 deletions teams/project-const-traits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,9 @@ alumni = []

[[github]]
orgs = ["rust-lang"]

[website]
name = "Const Traits Project Group"
description = "Project group working on const traits"
repo = "https://github.com/rust-lang/project-const-traits"
zulip-stream = "t-compiler/project-const-traits"
6 changes: 6 additions & 0 deletions teams/release-publishers.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ alumni = []

[[github]]
orgs = ["rust-lang"]

[website]
name = "Release Publishers"
description = "Release team members with permissions for crate publishing"
repo = "https://github.com/rust-lang/release-team"
zulip-stream = "t-release"
6 changes: 6 additions & 0 deletions teams/rustlings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,9 @@ alumni = []

[[github]]
orgs = ["rust-lang"]

[website]
name = "Rustlings team"
description = "Maintains the Rustlings site"
repo = "https://github.com/rust-lang/rustlings/"
zulip-stream = "rustlings"
4 changes: 4 additions & 0 deletions teams/social-media.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ alumni = []

[[lists]]
address = "[email protected]"

[website]
name = "Social media team"
description = "Handles posting on social media sites"
5 changes: 5 additions & 0 deletions teams/twir-reviewers.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ alumni = []
[[github]]
orgs = ["rust-lang"]
team-name = "twir-reviewers"

[website]
name = "TWiR reviewers"
description = "Reviewers for This Week in Rust"
repo = "https://github.com/rust-lang/this-week-in-rust"
5 changes: 5 additions & 0 deletions teams/twir.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ orgs = ["rust-lang"]

[[lists]]
address = "[email protected]"

[website]
name = "TWiR team"
description = "Publishes This Week in Rust"
repo = "https://github.com/rust-lang/this-week-in-rust"
6 changes: 6 additions & 0 deletions teams/types-fcp.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,9 @@ alumni = []
label = "T-types"
name = "Types"
ping = "rust-lang/types-fcp"

[website]
name = "Types FCP team"
description = "Types team members with responsibility for signing off on major compiler changes"
repo = "https://github.com/rust-lang/types-team"
zulip-stream = "t-types"
4 changes: 4 additions & 0 deletions teams/web-presence.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ extra-people = [
"shepmaster",
"pichfl",
]

[website]
name = "Web Presence team"
description = "Manages the Rust websites"
5 changes: 5 additions & 0 deletions teams/website.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ alumni = [

[[github]]
orgs = ["rust-lang"]

[website]
name = "Website team"
description = "Manages the www.rust-lang.org website"
repo = "https://github.com/rust-lang/www.rust-lang.org/"
48 changes: 44 additions & 4 deletions tests/static-api/_expected/v1/teams.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,17 @@
],
"alumni": [],
"github": null,
"website_data": null,
"website_data": {
"name": "Leaderless",
"description": "Test",
"page": "leaderless",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [],
"discord": []
},
Expand All @@ -101,7 +111,17 @@
"members": [],
"alumni": [],
"github": null,
"website_data": null,
"website_data": {
"name": "Leadership council",
"description": "test",
"page": "leadership-council",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [],
"discord": []
},
Expand Down Expand Up @@ -132,7 +152,17 @@
],
"alumni": [],
"github": null,
"website_data": null,
"website_data": {
"name": "Leads permissions",
"description": "Test",
"page": "leads-permissions",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [],
"discord": []
},
Expand Down Expand Up @@ -166,7 +196,17 @@
}
],
"github": null,
"website_data": null,
"website_data": {
"name": "WG Test",
"description": "test",
"page": "wg-test",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [
{
"id": "convener",
Expand Down
12 changes: 11 additions & 1 deletion tests/static-api/_expected/v1/teams/leaderless.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@
],
"alumni": [],
"github": null,
"website_data": null,
"website_data": {
"name": "Leaderless",
"description": "Test",
"page": "leaderless",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [],
"discord": []
}
12 changes: 11 additions & 1 deletion tests/static-api/_expected/v1/teams/leadership-council.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,17 @@
"members": [],
"alumni": [],
"github": null,
"website_data": null,
"website_data": {
"name": "Leadership council",
"description": "test",
"page": "leadership-council",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [],
"discord": []
}
12 changes: 11 additions & 1 deletion tests/static-api/_expected/v1/teams/leads-permissions.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,17 @@
],
"alumni": [],
"github": null,
"website_data": null,
"website_data": {
"name": "Leads permissions",
"description": "Test",
"page": "leads-permissions",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [],
"discord": []
}
12 changes: 11 additions & 1 deletion tests/static-api/_expected/v1/teams/wg-test.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,17 @@
}
],
"github": null,
"website_data": null,
"website_data": {
"name": "WG Test",
"description": "test",
"page": "wg-test",
"email": null,
"repo": null,
"discord": null,
"zulip_stream": null,
"matrix_room": null,
"weight": 0
},
"roles": [
{
"id": "convener",
Expand Down
4 changes: 4 additions & 0 deletions tests/static-api/teams/leaderless.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ top-level = true
leads = []
members = ["user-0"]
alumni = []

[website]
name = "Leaderless"
description = "Test"
4 changes: 4 additions & 0 deletions tests/static-api/teams/leadership-council.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ name = "leadership-council"
leads = []
members = []
alumni = []

[website]
name = "Leadership council"
description = "test"
4 changes: 4 additions & 0 deletions tests/static-api/teams/leads-permissions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ alumni = []

[leads-permissions]
bors.crates-io.review = true

[website]
name = "Leads permissions"
description = "Test"
4 changes: 4 additions & 0 deletions tests/static-api/teams/wg-test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ alumni = ["user-0", "user-5"]
[[roles]]
id = "convener"
description = "Convener"

[website]
name = "WG Test"
description = "test"