gftools mode for crater

fontc_crater/Cargo.toml

@@ -10,7 +10,7 @@ readme = "README.md"
 [dependencies]
 fontc = { version = "0.0.1", path = "../fontc" }
 
-google-fonts-sources = "0.5.0"
+google-fonts-sources = "0.5.1"
 maud = "0.26.0"
 tidier = "0.5.3"
 

fontc_crater/src/ci.rs

@@ -18,7 +18,7 @@ use crate::{
     args::CiArgs,
     error::Error,
     ttx_diff_runner::{DiffError, DiffOutput},
-    Results, Target,
+    BuildType, Results, Target,
 };
 
 mod html;
@@ -176,12 +176,46 @@ fn make_targets(cache_dir: &Path, repos: &[RepoInfo]) -> (Vec<Target>, BTreeMap<
                     .expect("source is always in cache dir")
                     .to_path_buf();
                 repo_list.insert(src_path.clone(), repo.repo_url.clone());
-                targets.push(Target {
-                    _config: config_path.to_owned(),
-                    source: src_path,
-                })
+                targets.extend(targets_for_source(&src_path, &config_path, &config))
             }
         }
     }
     (targets, repo_list)
 }
+
+fn targets_for_source(
+    src_path: &Path,
+    config_path: &Path,
+    config: &Config,
+) -> impl Iterator<Item = Target> {
+    let default = Some(Target {
+        config: config_path.to_owned(),
+        source: src_path.to_owned(),
+        build: BuildType::Default,
+    });
+
+    let gftools = should_build_in_gftools_mode(src_path, config).then(|| Target {
+        config: config_path.to_owned(),
+        source: src_path.to_owned(),
+        build: BuildType::GfTools,
+    });
+    [default, gftools].into_iter().flatten()
+}
+
+fn should_build_in_gftools_mode(src_path: &Path, config: &Config) -> bool {
+    // skip noto, which have an implicitly different recipe provider
+    if src_path
+        .file_stem()
+        .and_then(|stem| stem.to_str().map(|s| s.to_lowercase().contains("noto")))
+        .unwrap_or(false)
+    {
+        return false;
+    }
+
+    // if there is a recipe provider other than googlefonts, we skip
+    config
+        .recipe_provider
+        .as_ref()
+        .filter(|provider| *provider != "googlefonts")
+        .is_none()
+}

fontc_crater/src/main.rs

@@ -43,10 +43,12 @@ struct Results<T, E> {
     pub(crate) failure: BTreeMap<TargetId, E>,
 }
 
+#[derive(Clone, Debug)]
 pub(crate) struct Target {
     // will be used in gftools mode
-    pub(crate) _config: PathBuf,
+    pub(crate) config: PathBuf,
     pub(crate) source: PathBuf,
+    pub(crate) build: BuildType,
 }
 
 /// Uniquely identify a source + build type (default, gftools)
@@ -137,7 +139,7 @@ impl Target {
     pub(crate) fn id(&self) -> TargetId {
         TargetId {
             path: self.source.clone(),
-            build: crate::BuildType::Default,
+            build: self.build,
         }
     }
 }
@@ -148,15 +150,21 @@ impl Display for Target {
     }
 }
 
-impl Display for BuildType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+impl BuildType {
+    pub(crate) fn name(&self) -> &'static str {
         match self {
-            BuildType::Default => f.write_str("default"),
-            BuildType::GfTools => f.write_str("gftools"),
+            BuildType::Default => "default",
+            BuildType::GfTools => "gftools",
         }
     }
 }
 
+impl Display for BuildType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(self.name())
+    }
+}
+
 impl Display for TargetId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{} ({})", self.path.display(), self.build)

fontc_crater/src/ttx_diff_runner.rs

@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, path::Path, process::Command};
 
-use crate::{Results, RunResult, Target};
+use crate::{BuildType, Results, RunResult, Target};
 
 static SCRIPT_PATH: &str = "./resources/scripts/ttx_diff.py";
 // in the format expected by timeout(1)
@@ -10,17 +10,17 @@ pub(super) fn run_ttx_diff(cache_dir: &Path, target: &Target) -> RunResult<DiffO
     let tempdir = tempfile::tempdir().expect("couldn't create tempdir");
     let outdir = tempdir.path();
     let source_path = cache_dir.join(&target.source);
-    let output = match Command::new("timeout")
-        .arg(TTX_TIME_BUDGET)
-        .arg("python")
-        .arg(SCRIPT_PATH)
-        .args(["--compare", "default"])
-        .arg("--json")
+    let compare = target.build.name();
+    let mut cmd = Command::new("timeout");
+    cmd.arg(TTX_TIME_BUDGET)
+        .args(["python", SCRIPT_PATH, "--json", "--compare", compare])
         .arg("--outdir")
-        .arg(outdir)
-        .arg(source_path)
-        .output()
-    {
+        .arg(outdir);
+    if target.build == BuildType::GfTools {
+        cmd.arg("--config").arg(&target.config);
+    }
+    cmd.arg(source_path);
+    let output = match cmd.output() {
         Err(e) => return RunResult::Fail(DiffError::Other(e.to_string())),
         Ok(val) => val,
     };

resources/scripts/requirements.txt

@@ -8,3 +8,5 @@ fonttools
 lxml
 cdifflib
 glyphsLib
+# our custom branch of gftools
+git+https://github.com/googlefonts/gftools.git@fontc-flag-sketch