diff --git a/src/github/rollup.rs b/src/github/rollup.rs index 7655afe4..9d571e4b 100644 --- a/src/github/rollup.rs +++ b/src/github/rollup.rs @@ -377,17 +377,13 @@ async fn create_rollup( )); } } - body.push_str("\nr? @ghost"); - let similar_rollup_link = format!( - "[Create a similar rollup]({web_url}/queue/{repo_name}?prs={})", - pr_nums.iter().copied().map(|s| s.to_string()).join(",") + let ignored_body = format!( + "r? @ghost\n\n\ + [Create a similar rollup]({web_url}/queue/{repo_name}?prs={pr_nums})", + pr_nums = pr_nums.iter().copied().map(|s| s.to_string()).join(",") ); - writeln!( - body, - "\n\n{}\n", - make_text_ignored_by_bors(&similar_rollup_link) - )?; + writeln!(body, "\n{}\n", make_text_ignored_by_bors(&ignored_body))?; let title = format!("Rollup of {} pull requests", successes.len()); @@ -586,9 +582,9 @@ mod tests { - rust-lang/borstest#4 (Title of PR 4) + r? @ghost - [Create a similar rollup](https://bors-test.com/queue/borstest?prs=2,3,4,5) "); @@ -626,9 +622,9 @@ mod tests { - rust-lang/borstest#3 (Title of PR 3) + r? @ghost - [Create a similar rollup](https://bors-test.com/queue/borstest?prs=2,3,4) "); @@ -670,9 +666,9 @@ mod tests { - rust-lang/borstest#2 (Title of PR 2) - rust-lang/borstest#3 (Title of PR 3) + r? @ghost - [Create a similar rollup](https://bors-test.com/queue/borstest?prs=2,3) "); @@ -711,9 +707,9 @@ mod tests { - rust-lang/borstest#2 (Title of PR 2) - rust-lang/borstest#3 (Title of PR 3) + r? @ghost - [Create a similar rollup](https://bors-test.com/queue/borstest?prs=2,3) "); @@ -754,9 +750,9 @@ mod tests { - rust-lang/borstest#2 (Title of PR 2) - rust-lang/borstest#3 (Title of PR 3) + r? @ghost - [Create a similar rollup](https://bors-test.com/queue/borstest?prs=2,3) "); @@ -794,9 +790,9 @@ mod tests { - rust-lang/borstest#2 (Title of PR 2) - rust-lang/borstest#5 (Title of PR 5) + r? @ghost - [Create a similar rollup](https://bors-test.com/queue/borstest?prs=2,3,4,5) "); @@ -823,9 +819,9 @@ mod tests { - rust-lang/borstest#2 (Title of PR 2) - rust-lang/borstest#3 (Title of PR 3) + r? @ghost - [Create a similar rollup](https://bors-test.com/queue/borstest?prs=3,2) ");