Skip to content

Add comment text when a PR is unapproved #747

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
Apr 21, 2026
+21 −12
Merged

Add comment text when a PR is unapproved #747

Show file tree
Hide file tree
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
9 changes: 1 addition & 8 deletions src/bors/handlers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,14 +1011,7 @@ pub fn invalidation_comment(
.map(|b| b.status.is_failure_or_cancel())
.unwrap_or(false);

// In this case we do not have to post a comment, to avoid needless spam
// It would be nicer to solve this in some more robust way..
let is_simple_unapproval = matches!(reason, InvalidationReason::Unapproval { .. })
&& !outcome.closed
&& build_cancelled_msg.is_none()
&& invalidated_rollups.is_empty();

if outcome.unapproved && !is_simple_unapproval && (!had_failed_build || outcome.closed) {
if outcome.unapproved && (!had_failed_build || outcome.closed) {
append(format!(
"This {pr_label} was{} unapproved{}.",
if is_rollup { " thus" } else { "" },
Expand Down
18 changes: 15 additions & 3 deletions src/bors/handlers/review.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,11 @@ 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?, @"[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/1/main-sha1..pr-1-sha)");
insta::assert_snapshot!(ctx.get_next_comment_text(()).await?, @"
This pull request was unapproved.

[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/1/main-sha1..pr-1-sha)
");
ctx.pr(()).await.expect_unapproved();
Ok(())
})
Expand Down Expand Up @@ -933,7 +937,11 @@ approved = { modifications = ["+foo", "+baz"], unless = ["label1", "label2"] }
It is now in the [queue](https://bors-test.com/queue/borstest) for this repository.
");
ctx.post_comment("@bors r-").await?;
insta::assert_snapshot!(ctx.get_next_comment_text(()).await?, @"[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/1/main-sha1..pr-1-sha)");
insta::assert_snapshot!(ctx.get_next_comment_text(()).await?, @"
This pull request was unapproved.

[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/1/main-sha1..pr-1-sha)
");
ctx.pr(()).await.expect_unapproved();

Ok(())
Expand Down Expand Up @@ -1238,7 +1246,11 @@ approved = { modifications = ["+foo", "+baz"], unless = ["label1", "label2"] }
.expect_approved_by(&User::default_pr_author().name);

ctx.post_comment(review_comment("@bors r-")).await?;
insta::assert_snapshot!(ctx.get_next_comment_text(()).await?, @"[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/1/main-sha1..pr-1-sha)");
insta::assert_snapshot!(ctx.get_next_comment_text(()).await?, @"
This pull request was unapproved.

[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/1/main-sha1..pr-1-sha)
");
ctx.pr(()).await.expect_unapproved();

Ok(())
Expand Down
6 changes: 5 additions & 1 deletion src/github/rollup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,11 @@ also include this pls"
.await?
.assert_status(StatusCode::SEE_OTHER);
ctx.post_comment(Comment::new(pr3.id(), "@bors r-")).await?;
insta::assert_snapshot!(ctx.get_next_comment_text(3).await?, @"[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/3/main-sha1..pr-3-sha)");
insta::assert_snapshot!(ctx.get_next_comment_text(3).await?, @"
This pull request was unapproved.

[View changes since this unapproval](https://triagebot.infra.rust-lang.org/gh-changes-since/rust-lang/borstest/3/main-sha1..pr-3-sha)
");
insta::assert_snapshot!(ctx.get_next_comment_text(4).await?, @"
PR #3, which is a member of this rollup, was [unapproved](https://github.com/rust-lang/borstest/pull/3#issuecomment-3).
");
Expand Down