Merge pull request #1085 from googlefonts/crater-fix-result-key

[crater] Use timestamp to key crater results
googlefonts · Nov 4, 2024 · 757e0b0 · 757e0b0
2 parents 2b75047 + 3cdee1c
commit 757e0b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/fontc_crater/src/ci.rs b/fontc_crater/src/ci.rs
@@ -87,7 +87,7 @@ fn run_crater_and_save_results(args: &CiArgs) -> Result<(), Error> {
     let mut prev_runs: Vec<RunSummary> = load_json_if_exists_else_default(&summary_file)?;
     // todo: fontc_repo should be checked out by us, and have a known path
     let fontc_rev = super::get_git_rev(None).unwrap();
-    let pip_freeze_sha = super::pip_freeze_sha();
+    let pip_freeze_sha = dbg!(super::pip_freeze_sha());
     if let Some(last_run) = prev_runs.last() {
         if last_run.fontc_rev == fontc_rev
             && Some(last_run.input_file.as_os_str()) == args.to_run.file_name()

diff --git a/fontc_crater/src/ci/html.rs b/fontc_crater/src/ci/html.rs
@@ -12,6 +12,7 @@ use crate::{
     ttx_diff_runner::{CompilerFailure, DiffError, DiffOutput, DiffValue},
     Target,
 };
+use chrono::{DateTime, Utc};
 use maud::{html, Markup, PreEscaped};
 
 use super::{DiffResults, RunSummary};
@@ -27,7 +28,7 @@ pub(super) fn generate(target_dir: &Path) -> Result<(), Error> {
     let details = summary
         .iter()
         .flat_map(|run| match run.try_load_results(target_dir) {
-            Some(Ok(results)) => Some(Ok((run.fontc_rev.clone(), results))),
+            Some(Ok(results)) => Some(Ok((run.began, results))),
             None => None,
             Some(Err(e)) => Some(Err(e)),
         })
@@ -41,7 +42,7 @@ pub(super) fn generate(target_dir: &Path) -> Result<(), Error> {
 fn make_html(
     summary: &[RunSummary],
     sources: &BTreeMap<PathBuf, String>,
-    results: &HashMap<String, DiffResults>,
+    results: &HashMap<DateTime<Utc>, DiffResults>,
 ) -> Result<String, Error> {
     let table_body = make_table_body(summary);
     let css = include_str!("../../resources/style.css");
@@ -65,8 +66,8 @@ fn make_html(
     };
     let detailed_report = match summary {
         [.., prev, current] => make_detailed_report(
-            results.get(&current.fontc_rev).unwrap(),
-            results.get(&prev.fontc_rev).unwrap(),
+            results.get(&current.began).unwrap(),
+            results.get(&prev.began).unwrap(),
             sources,
         ),
         _ => html!(),