From 8ccddd9cdc94bda141462fb9cbbde4f8eaccfca3 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sat, 23 Mar 2024 22:57:07 +0800 Subject: [PATCH] feat: add extra space in build result --- server/src/formatter.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/formatter.rs b/server/src/formatter.rs index aa7a9a5..084583f 100644 --- a/server/src/formatter.rs +++ b/server/src/formatter.rs @@ -98,7 +98,7 @@ pub fn to_html_build_result( String::new() }, job.arch, - job.packages, + job.packages.replace(",", ", "), &successful_packages.join(", "), &failed_package.clone().unwrap_or(String::from("None")), &skipped_packages.join(", "), @@ -139,7 +139,7 @@ pub fn to_markdown_build_result( 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(&job.packages.replace(",", ", ")), teloxide::utils::markdown::escape(&successful_packages.join(", ")), teloxide::utils::markdown::escape(&failed_package.clone().unwrap_or(String::from("None"))), teloxide::utils::markdown::escape(&skipped_packages.join(", ")), @@ -182,7 +182,7 @@ fn test_format_html_build_result() { let job = Job { id: 1, pipeline_id: 1, - packages: "fd".to_string(), + packages: "fd,fd2".to_string(), arch: "amd64".to_string(), creation_time: DateTime::from_timestamp(61, 0).unwrap(), status: "success".to_string(), @@ -219,5 +219,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\nJob: #1\nPipeline: #1\nEnqueue time: 1970-01-01 00:01:01 UTC\nTime elapsed: 888s\nGit commit: 34acef16\nGit branch: fd-9.0.0\nGitHub PR: #4992\nArchitecture: amd64\nPackage(s) to build: fd\nPackage(s) successfully built: fd\nPackage(s) failed to build: None\nPackage(s) not built due to previous build failure: \n\nBuild Log >>") + assert_eq!(s, "✅\u{fe0f} Job completed on Yerus (amd64)\n\nJob: #1\nPipeline: #1\nEnqueue time: 1970-01-01 00:01:01 UTC\nTime elapsed: 888s\nGit commit: 34acef16\nGit branch: fd-9.0.0\nGitHub PR: #4992\nArchitecture: amd64\nPackage(s) to build: fd, fd2\nPackage(s) successfully built: fd\nPackage(s) failed to build: None\nPackage(s) not built due to previous build failure: \n\nBuild Log >>") }