Make comment of triage build link back to the triage invocation

Author: JonathanBrouwer

site/src/github/comparison_summary.rs

@@ -163,10 +163,10 @@ async fn summarize_run(
     )
     .unwrap();
 
-    let next_steps = match source {
+    let next_steps = match &source {
         PerfRunSource::TryBuild => try_run_body(is_regression, deserves_attention),
         PerfRunSource::MasterCommit => master_run_body(is_regression),
-        PerfRunSource::TriageBuild(_) => todo!(),
+        PerfRunSource::TriageBuild(triage_build) => triage_run_body(triage_build, is_regression),
     };
     writeln!(&mut message, "{next_steps}\n").unwrap();
 
@@ -372,3 +372,16 @@ Benchmarking means the PR may be perf-sensitive. \
 @rustbot label: -S-waiting-on-perf {sign}perf-regression",
     )
 }
+
+fn triage_run_body(build: &TriageBuild, is_regression: bool) -> String {
+    // The triage url deliberately not prefixed with "https://github.com/" as to not trigger the
+    // "mentioned this pull request" github entry on the rollup
+    format!(
+        "This PR was benchmarked as part of triage on the rollup it merged in: [triage URL](/rust-lang/rust/pull/{}#issuecomment-{})\
+        \n\n\
+        {}",
+        build.rollup_pr_number,
+        build.triage_comment.id,
+        master_run_body(is_regression)
+    )
+}

site/src/github/triage.rs

@@ -3,8 +3,8 @@ use crate::request_handlers::parse_unrolled_build_message;
 use database::QueuedCommit;
 
 pub struct TriageBuild {
-    rollup_pr_number: u32,
-    triage_comment: ResponseComment,
+    pub rollup_pr_number: u32,
+    pub triage_comment: ResponseComment,
 }
 
 pub const TRIAGE_MARKER: &str = "<!-- rust-timer: triage -->";
@@ -27,9 +27,7 @@ pub async fn is_triage_run(
         .get_comments(unrolled_build.rollup_pr_number)
         .await?;
     let Some(triage_comment) = rollup_comments.into_iter().rev().find(|c| {
-        c.author.login == "rust-timer"
-            && c.body.contains(TRIAGE_MARKER)
-            && c.body.contains(&commit.sha)
+        c.viewer_did_author && c.body.contains(TRIAGE_MARKER) && c.body.contains(&commit.sha)
     }) else {
         // This was a try job on the unrolled build that did not originate from a triage command
         return Ok(None);