feat: display git branch in job result

AOSC-Dev · Mar 23, 2024 · d7df009 · d7df009
1 parent 54ff037
commit d7df009
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/server/src/formatter.rs b/server/src/formatter.rs
@@ -58,6 +58,7 @@ pub fn to_html_build_result(
 <b>Enqueue time</b>: {}
 <b>Time elapsed</b>: {}
 <b>Git commit</b>: {}
+<b>Git branch</b>: {}
 {}<b>Architecture</b>: {}
 <b>Package(s) to build</b>: {}
 <b>Package(s) successfully built</b>: {}
@@ -79,6 +80,10 @@ pub fn to_html_build_result(
             pipeline.git_sha,
             &pipeline.git_sha[..8]
         ),
+        format!(
+            "<a href=\"https://github.com/AOSC-Dev/aosc-os-abbs/tree/{}\">{}</a>",
+            pipeline.git_branch, &pipeline.git_branch
+        ),
         if let Some(pr) = pipeline.github_pr {
             format!(
                 "<b>GitHub PR</b>: <a href=\"https://github.com/AOSC-Dev/aosc-os-abbs/pull/{}\">#{}</a>\n",
@@ -118,14 +123,15 @@ pub fn to_markdown_build_result(
     } = job_ok;
 
     format!(
-        "{} Job completed on {} \\({}\\)\n\n**Job**: {}\n**Enqueue time**: {}\n**Time elapsed**: {}s\n{}**Architecture**: {}\n**Package\\(s\\) to build**: {}\n**Package\\(s\\) successfully built**: {}\n**Package\\(s\\) failed to build**: {}\n**Package\\(s\\) not built due to previous build failure**: {}\n\n{}\n",
+        "{} Job completed on {} \\({}\\)\n\n**Job**: {}\n**Enqueue time**: {}\n**Time elapsed**: {}s\n{}{}**Architecture**: {}\n**Package\\(s\\) to build**: {}\n**Package\\(s\\) successfully built**: {}\n**Package\\(s\\) failed to build**: {}\n**Package\\(s\\) not built due to previous build failure**: {}\n\n{}\n",
         if success { SUCCESS } else { FAILED },
         worker_hostname,
         worker_arch,
         format!("[#{}](https://buildit.aosc.io/jobs/{})", job.id, job.id),
         teloxide::utils::markdown::escape(&job.creation_time.to_string()),
         elapsed_secs,
         format!("**Git commit**: [{}](https://github.com/AOSC-Dev/aosc-os-abbs/commit/{})\n", &pipeline.git_sha[..8], pipeline.git_sha),
+        format!("**Git branch**: [{}](https://github.com/AOSC-Dev/aosc-os-abbs/tree/{})\n", &pipeline.git_branch, pipeline.git_branch),
         job.arch,
         teloxide::utils::markdown::escape(&job.packages),
         teloxide::utils::markdown::escape(&successful_packages.join(", ")),
@@ -207,5 +213,5 @@ fn test_format_html_build_result() {
 
     let s = to_html_build_result(&pipeline, &job, &job_ok, worker_hostname, worker_arch, true);
 
-    assert_eq!(s, "✅\u{fe0f} Job completed on Yerus (amd64)\n\n<b>Job</b>: <a href=\"https://buildit.aosc.io/jobs/1\">#1</a>\n<b>Enqueue time</b>: 1970-01-01 00:01:01 UTC\n<b>Time elapsed</b>: 888s\n<b>Git commit</b>: <a href=\"https://github.com/AOSC-Dev/aosc-os-abbs/commit/34acef168fc5ec454d3825fc864964951b130b49\">34acef16</a>\n<b>GitHub PR</b>: <a href=\"https://github.com/AOSC-Dev/aosc-os-abbs/pull/4992\">#4992</a>\n<b>Architecture</b>: amd64\n<b>Package(s) to build</b>: fd\n<b>Package(s) successfully built</b>: fd\n<b>Package(s) failed to build</b>: None\n<b>Package(s) not built due to previous build failure</b>: \n\n<a href=\"https://pastebin.aosc.io/paste/c0rWzj4EsSC~CVXs2qXtFw\">Build Log >></a>")
+    assert_eq!(s, "✅\u{fe0f} Job completed on Yerus (amd64)\n\n<b>Job</b>: <a href=\"https://buildit.aosc.io/jobs/1\">#1</a>\n<b>Enqueue time</b>: 1970-01-01 00:01:01 UTC\n<b>Time elapsed</b>: 888s\n<b>Git commit</b>: <a href=\"https://github.com/AOSC-Dev/aosc-os-abbs/commit/34acef168fc5ec454d3825fc864964951b130b49\">34acef16</a>\n<b>Git branch</b>: <a href=\"https://github.com/AOSC-Dev/aosc-os-abbs/tree/fd-9.0.0\">fd-9.0.0</a>\n<b>GitHub PR</b>: <a href=\"https://github.com/AOSC-Dev/aosc-os-abbs/pull/4992\">#4992</a>\n<b>Architecture</b>: amd64\n<b>Package(s) to build</b>: fd\n<b>Package(s) successfully built</b>: fd\n<b>Package(s) failed to build</b>: None\n<b>Package(s) not built due to previous build failure</b>: \n\n<a href=\"https://pastebin.aosc.io/paste/c0rWzj4EsSC~CVXs2qXtFw\">Build Log >></a>")
 }