Skip to content
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

Add www.rust-lang.org repository under automation #1271

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jan 22, 2024

Repo: https://github.com/rust-lang/www.rust-lang.org

CC @dtolnay @Manishearth

Extracted from GH:

org = "rust-lang"
name = "www.rust-lang.org"
description = "The home of the Rust website"
bots = []

[access.teams]
website = "write"
security = "pull"

[access.individuals]
pietroalbini = "admin"
MarcoIeni = "admin"
senekor = "write"
Mark-Simulacrum = "admin"
rustbot = "write"
rust-pontoon-trial = "write"
Manishearth = "write"
rust-lang-owner = "admin"
jdno = "admin"

[[branch-protections]]
pattern = "master"
required-approvals = 0
pr-required = false

[[branch-protections]]
pattern = "deploy"
required-approvals = 0
pr-required = false
restrict-pushes = true
allowed-merge-teams = ["website"]

[[branch-protections]]
pattern = "try"
required-approvals = 0
pr-required = false

@Manishearth
Copy link
Member

I should probably have admin.

I think the pontoon accounts are still used but it's been a while since I've poked at that integration

@Kobzol
Copy link
Contributor Author

Kobzol commented Jan 22, 2024

I know that it is currently only you, but perhaps we should then make it website = "admin" to keep it general?

@Manishearth
Copy link
Member

I'm planning on growing the team soon (I'd like to add @senekor and @Turbo87) once I have a discussion with council and I don't want team membership to imply admin, though probably eventually most team members will have admin.

@Kobzol Kobzol force-pushed the repo-www.rust-lang.org branch from 1de4298 to 4b08419 Compare January 23, 2024 07:48
@Kobzol
Copy link
Contributor Author

Kobzol commented Jan 23, 2024

Ok, changed. Just out of curiosity, why is admin needed on this repo?

@rylev
Copy link
Member

rylev commented Jan 23, 2024

Perhaps we should note why @Manishearth needs admin rights so we can review this in the future.

This also makes me think that it would be nice to have a tool that collects all individuals with individual access to repos and generates a report that automatically gets posted somewhere every 3ish months for review.

@Kobzol Kobzol marked this pull request as draft January 23, 2024 11:07
@Kobzol
Copy link
Contributor Author

Kobzol commented Jan 23, 2024

(Marking as draft now, since sync-team doesn't set push allowances by default, which would change the branch protection on this repo).

@rylev
Copy link
Member

rylev commented Jan 23, 2024

I don't want team membership to imply admin, though probably eventually most team members will have admin.

I think the way we prefer to handle this is by creating a new team as a subteam which reflects these permissions.

@Manishearth
Copy link
Member

@rylev it's for things like Pontoon and Heroku setup. Third party integrations, especially experimenting with them, often needs admin to go smoothly.

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 28, 2024

There are currently two people in the website team. @Manishearth would you be ok with giving admin to the whole team?

@Manishearth
Copy link
Member

Yep!

@Kobzol Kobzol force-pushed the repo-www.rust-lang.org branch from 414d5fc to 8896290 Compare September 28, 2024 19:43
@Kobzol Kobzol marked this pull request as ready for review September 28, 2024 19:43
@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 28, 2024

Ok, I added admin access for the website team (and added an explaining comment on top of it), and added pr-required = false and allowed-merge-teams attributes to branch protections (these weren't supported when I originally created this PR).

@Kobzol Kobzol requested a review from jackh726 September 28, 2024 19:44
@senekor
Copy link
Contributor

senekor commented Sep 28, 2024

I don't know why the try branch has branch protection. It's a 4 year old stale branch and its changes only have some text thanking our alumni. The website already does that, so I'm assuming the changes were merged in some way. I was cleaning out a bunch of stale branches at one point, the only reason I didn't delete this one is because I couldn't.

I think this branch protection can be safely removed.

@Kobzol
Copy link
Contributor Author

Kobzol commented Sep 30, 2024

@Manishearth Since you're an admin, if you agree that try is not useful, could you please delete it? I will then remove the corresponding branch protection from this PR.

@Manishearth
Copy link
Member

I don't seem to have access to the branch protection rules and I can't delete it.

@Kobzol
Copy link
Contributor Author

Kobzol commented Oct 26, 2024

Right, I meant more deleting the branch itself from the repo. In any case, if you agree that the try branch isn't used anymore, I'll just remove the branch protection form this PR.

@Kobzol Kobzol force-pushed the repo-www.rust-lang.org branch from 8896290 to c197113 Compare October 26, 2024 16:48
@Kobzol
Copy link
Contributor Author

Kobzol commented Oct 26, 2024

Removed the branch protection for the try branch. This should be ready now.

rylev
rylev previously approved these changes Oct 31, 2024
@Kobzol
Copy link
Contributor Author

Kobzol commented Oct 31, 2024

Oh, I just noticed that before, there was required-approvals = 0, but it isn't in the current state of this PR. @Manishearth Do you want PRs to be "self-approvable", or do you want to require approvals?

@Manishearth
Copy link
Member

Self approvable is fine for such a small team imo

@Kobzol
Copy link
Contributor Author

Kobzol commented Oct 31, 2024

Ok, done. Now it should be ready 😆 Edit: nevermind, pr-required = false implies required-approvals = 0. I'm pretty sure I went through this already on this PR, several months ago..

@Kobzol Kobzol force-pushed the repo-www.rust-lang.org branch from 11208cf to a116d7b Compare October 31, 2024 18:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants