Skip to content

feat: implement ruleset bypass actor#2199

Open
amustaque97 wants to merge 6 commits intorust-lang:mainfrom
amustaque97:feat/2192-implement-ruleset-bypass-actors
Open

feat: implement ruleset bypass actor#2199
amustaque97 wants to merge 6 commits intorust-lang:mainfrom
amustaque97:feat/2192-implement-ruleset-bypass-actors

Conversation

@amustaque97
Copy link
Contributor

@amustaque97 amustaque97 commented Dec 22, 2025

Closes: #2192

@github-actions
Copy link

github-actions bot commented Dec 22, 2025 •
edited
Loading

Dry-run check results 

[WARN  sync_team] sync-team is running in dry mode, no changes will be applied.
[INFO  sync_team] synchronizing crates-io
[INFO  sync_team] synchronizing github
[INFO  sync_team] 💻 Repo Diffs:
    📝 Editing repo 'rust-lang/bors':
      Rulesets:
          Ruleset for main
            No changes

@amustaque97 amustaque97 force-pushed the feat/2192-implement-ruleset-bypass-actors branch 2 times, most recently from 29a954f to 023b6b5 Compare December 22, 2025 18:45
amustaque97
amustaque97 commented Dec 23, 2025
View reviewed changes
sync-team/src/github/mod.rs
source_type: RulesetSourceType::Repository,
enforcement: RulesetEnforcement::Active,
bypass_actors: None,
bypass_actors: None, // Will be populated when applying the diff
Copy link
Contributor Author

@amustaque97 amustaque97 Dec 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can discuss if this needs to be changed. I can think of making ID resolution methods available on the read client.

I'm okay with this comment because the current implementation is read-only

amustaque97
amustaque97 commented Dec 23, 2025
View reviewed changes
@amustaque97 amustaque97 marked this pull request as ready for review December 23, 2025 08:01
@amustaque97 amustaque97 force-pushed the feat/2192-implement-ruleset-bypass-actors branch from e1c1ba6 to 0330575 Compare January 7, 2026 04:32
marcoieni
marcoieni reviewed Jan 13, 2026
View reviewed changes
Copy link
Member

@marcoieni marcoieni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you edit a toml file that can take advantage of this so that we can test this PR later? (I still need to review it before testing it)

@jieyouxu jieyouxu added needs-infra-admin-review This change requires one of the `infra-admins` to review. S-waiting-on-review Status: waiting on review from a team/WG/PG lead, an infra-admin, and/or a team-repo-admin. labels Jan 15, 2026
@amustaque97
Copy link
Contributor Author

amustaque97 commented Jan 21, 2026

Can you edit a toml file that can take advantage of this so that we can test this PR later? (I still need to review it before testing it)

We don't have to do it for time being until this is stable enough as we've added an undocumented config https://github.com/rust-lang/team/blob/main/config.toml#L84-L86

So it will read the values from repos/rust-lang/bors.toml.

Yes we need to test it as i was not able to setup and test bots or allowed-merge-teams 😅

amustaque97
amustaque97 commented Jan 21, 2026
View reviewed changes
sync-team/src/github/mod.rs
for team_name in &branch_protection.allowed_merge_teams {
match github_write.resolve_team_database_id(org, team_name) {
Ok(Some(actor_id)) => {
bypass_actors.push(api::RulesetBypassActor {
Copy link
Contributor Author

@amustaque97 amustaque97 Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Image

There is no concerete example or an easy way that i can figure out if bors, homu or merge bots are user accounts or a team. So I would need your attention here so i can move accordingly.

amustaque97
amustaque97 commented Jan 21, 2026
View reviewed changes
sync-team/src/github/mod.rs
continue;
}
};
match github_write.resolve_user_database_id(user_login, org) {
Copy link
Contributor Author

@amustaque97 amustaque97 Jan 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here as https://github.com/rust-lang/team/pull/2199/changes#r2713998682

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marcoieni marcoieni marcoieni left review comments

@Mark-Simulacrum Mark-Simulacrum Awaiting requested review from Mark-Simulacrum Mark-Simulacrum is a code owner

@emilyalbini emilyalbini Awaiting requested review from emilyalbini emilyalbini is a code owner

@jdno jdno Awaiting requested review from jdno jdno is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

needs-infra-admin-review This change requires one of the `infra-admins` to review. S-waiting-on-review Status: waiting on review from a team/WG/PG lead, an infra-admin, and/or a team-repo-admin.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Implement bypass actors for rulesets based on allowed_merge_teams and merge_bots

3 participants

@amustaque97 @marcoieni @jieyouxu