bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make parent in download_auto_job_metrics optional

Browse source
This commit is contained in:
Jakub Beránek 2025-04-16 13:24:01 +02:00
parent 94015d3cd4
commit d14df2652d
No known key found for this signature in database
GPG key ID: 909CD0D26483516B
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ci/citool/src/main.rs
View file

@ -180,7 +180,7 @@ fn postprocess_metrics(
}
fn post_merge_report(db: JobDatabase, current: String, parent: String) -> anyhow::Result<()> {
let metrics = download_auto_job_metrics(&db, &parent, &current)?;
let metrics = download_auto_job_metrics(&db, Some(&parent), &current)?;
println!("\nComparing {parent} (parent) -> {current} (this PR)\n");

23
src/ci/citool/src/metrics.rs
View file

@ -46,24 +46,25 @@ pub struct JobMetrics {
/// `parent` and `current` should be commit SHAs.
pub fn download_auto_job_metrics(
job_db: &JobDatabase,
parent: &str,
parent: Option<&str>,
current: &str,
) -> anyhow::Result<HashMap<JobName, JobMetrics>> {
let mut jobs = HashMap::default();
for job in &job_db.auto_jobs {
eprintln!("Downloading metrics of job {}", job.name);
let metrics_parent = match download_job_metrics(&job.name, parent) {
Ok(metrics) => Some(metrics),
Err(error) => {
eprintln!(
r#"Did not find metrics for job `{}` at `{parent}`: {error:?}.
let metrics_parent =
parent.and_then(|parent| match download_job_metrics(&job.name, parent) {
Ok(metrics) => Some(metrics),
Err(error) => {
eprintln!(
r#"Did not find metrics for job `{}` at `{parent}`: {error:?}.
Maybe it was newly added?"#,
job.name
);
None
}
};
job.name
);
None
}
});
let metrics_current = download_job_metrics(&job.name, current)?;
jobs.insert(
job.name.clone(),