Skip to content

Only require try permissions for marking a PR as rollup #553

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.

Sign up for GitHub

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
Kobzol merged 1 commit into from
Jan 6, 2026
Merged

Only require try permissions for marking a PR as rollup #553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 16 additions & 2 deletions src/bors/handlers/review.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,10 @@ pub(super) async fn command_set_rollup(
author: &GithubUser,
rollup: RollupMode,
) -> anyhow::Result<()> {
if !has_permission(&repo_state, author, pr, PermissionType::Review).await? {
deny_request(&repo_state, pr.number(), author, PermissionType::Review).await?;
// Require only try for rollup commands, because rust-timer uses them, and we don't want to
// grant it approve permissions.
if !has_permission(&repo_state, author, pr, PermissionType::Try).await? {
deny_request(&repo_state, pr.number(), author, PermissionType::Try).await?;
return Ok(());
}
db.set_rollup(pr.db, rollup).await
Expand Down Expand Up @@ -1084,6 +1086,18 @@ approved = ["+foo", "+baz", "-bar", "-foo2"]
.await;
}

#[sqlx::test]
async fn set_rollup_try_permissions(pool: sqlx::PgPool) {
run_test(pool, async |ctx: &mut BorsTester| {
ctx.post_comment(Comment::new((), "@bors rollup=never").with_author(User::try_user()))
.await?;
ctx.wait_for_pr((), |pr| pr.rollup == Some(RollupMode::Never))
.await?;
Ok(())
})
.await;
}

#[sqlx::test]
async fn rollup_preserved_after_approve(pool: sqlx::PgPool) {
run_test(pool, async |ctx: &mut BorsTester| {
Expand Down