Skip to content

Do not respond to unapprovals unless an auto build was cancelled #674

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 26, 2026
Merged

Do not respond to unapprovals unless an auto build was cancelled #674

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
24 changes: 10 additions & 14 deletions src/bors/handlers/review.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,11 @@ pub(super) async fn command_unapprove(
)
.await?;
unapprove_pr(&repo_state, &db, pr.db, pr.github).await?;
notify_of_unapproval(&repo_state, &db, pr, auto_build_cancel_message).await?;

// Only send unapproval comment when a build was canceled, to avoid needless spam
if let Some(cancel_msg) = auto_build_cancel_message {
notify_of_unapproval(&repo_state, &db, pr, cancel_msg).await?;
}

Ok(())
}
Expand Down Expand Up @@ -403,13 +407,12 @@ async fn notify_of_unapproval(
repo: &RepositoryState,
db: &PgDbClient,
pr: PullRequestData<'_>,
cancel_message: Option<String>,
cancel_message: String,
) -> anyhow::Result<()> {
let mut comment = format!("Commit {} has been unapproved.", pr.github.head.sha);

if let Some(message) = cancel_message {
comment.push_str(&format!("\n\n{message}"));
}
let comment = format!(
"Commit {} has been unapproved.\n\n{cancel_message}",
pr.github.head.sha
);

repo.client
.post_comment(pr.number(), Comment::new(comment), db)
Expand Down Expand Up @@ -733,11 +736,6 @@ approved = { modifications = ["+foo", "+baz"], unless = ["label1", "label2"] }
.await
.expect_approved_by(&User::default_pr_author().name);
ctx.post_comment("@bors r-").await?;
insta::assert_snapshot!(
ctx.get_next_comment_text(()).await?,
@"Commit pr-1-sha has been unapproved."
);

ctx.pr(()).await.expect_unapproved();
Ok(())
})
Expand Down Expand Up @@ -1078,8 +1076,6 @@ approved = { modifications = ["+foo", "+baz"], unless = ["label1", "label2"] }
.expect_approved_by(&User::default_pr_author().name);

ctx.post_comment(review_comment("@bors r-")).await?;
ctx.expect_comments((), 1).await;

ctx.pr(()).await.expect_unapproved();

Ok(())
Expand Down