Skip to content

Commit 90e6eb7

Browse files
committed
Add back always rollup=never
1 parent 795d7d5 commit 90e6eb7

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

site/src/github.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -637,18 +637,6 @@ pub async fn post_finished(data: &InputData) {
637637
Some(Direction::Regression | Direction::Mixed) => "+perf-regression",
638638
Some(Direction::Improvement) | None => "-perf-regression",
639639
};
640-
641-
let rollup = if let Some(_) = direction {
642-
"Benchmarking this pull request showed some changes in performance \
643-
so we're automatically marking it as not fit for rolling up.
644-
645-
@bors rollup=never"
646-
} else {
647-
"Even though no performance changes were detected, if you still believe\
648-
this pull request to potentially be performance sensitive, consider running\
649-
`@bors rollup=never` or `@bors rollup=iffy`.\n"
650-
};
651-
652640
post_comment(
653641
&data.config,
654642
commit.pr,
@@ -657,9 +645,19 @@ pub async fn post_finished(data: &InputData) {
657645
658646
**Summary**: {}
659647
660-
{}
648+
Benchmarking this pull request likely means that it is \
649+
perf-sensitive, so we're automatically marking it as not fit \
650+
for rolling up. Please note that if the perf results are \
651+
neutral, you should likely undo the rollup=never given below \
652+
by specifying `rollup-` to bors.
653+
654+
Importantly, though, if the results of this run are \
655+
non-neutral **do not** roll this PR up -- it will mask other \
656+
regressions or improvements in the roll up.
657+
658+
@bors rollup=never
661659
@rustbot label: +S-waiting-on-review -S-waiting-on-perf {}",
662-
commit.sha, comparison_url, summary, rollup, label
660+
commit.sha, comparison_url, summary, label
663661
),
664662
)
665663
.await;

0 commit comments

Comments
 (0)