mirror of
https://github.com/storytold/effectcraft.git
synced 2026-11-11 02:31:25 +00:00
* AG4: xtask ci --affected cargo xtask ci --affected [--base REV] [--dry-run] runs fmt, clippy, tests (nextest + doctests when available), layers, assets (only on asset changes) and wasm (only for affected L0-L4/web crates) for the packages a change can affect: changed files map to the owning package and to packages whose sources read them via ../ paths, expanded to reverse dependents. Workspace-wide inputs (root Cargo.toml, Cargo.lock, .cargo/, xtask/, toolchain, clippy.toml) fall back to full CI. Documented in docs/testing.md, AGENTS.md and CLAUDE.md. (cherry picked from commit f3ca84fc2ee3948582cbc94e4c99ee510e829540) (cherry picked from commit 8a2cdcadf447eafa57ab14016beae4420f002af0) (cherry picked from commitd8a4301bc1) (cherry picked from commit 36402c61ac2f7e29ecd76a6cfc89365cc2572e0a) * AO1: fast CI profile, looser timing tests - [profile.ci] (release without LTO, 16 codegen units); `xtask ci` runs clippy and tests with --profile ci instead of --release. - Wall-clock asserts in engine memory_tick, gpu OpenGL decline and script socket tests keep their intent with bounds that survive a loaded machine. - docs/testing.md and CONTRIBUTING.md mention the profile. (cherry picked from commit b45c8a379351ebdfda0d7076ad4b740baf6f2087) (cherry picked from commit fa1ea6a107c4c1936cde89b518a05adc73f2b4b0) (cherry picked from commite5d5ed80e9) (cherry picked from commit d2c67660c70764f9c56880a642ad7f0d004a7f92) * AG6: journal replay repros Bug reports become replay scripts and crash regression tests become data files: - engine::replay: a JSON-lines repro format (start line, command steps with expect_error, expect queries with JSON pointer + equals, expect_no_error), a never-panicking runner that reports per-step ok/error and the first failure, and journal export (from the last project open; saves left out; size-capped). - journal.export {path?} and help.exportRepro {path?} (not journaled). - Crash capture: when the last-resort guard catches a panic in the outermost command, the journal plus that command is saved to Repros/crash-*.jsonl in the settings store (newest 20 kept) and the error names the file. - Commands run by a journaled command (script steps) are no longer journaled twice. - effectcraft-cli replay SCRIPT.jsonl [--json] [--keep-going]: exits 1 on a failed step, unmet expectation or panic. - crates/host/tests/repros.rs replays every tests/repros/*.jsonl; three samples from past crash fixes (zero frame rate, Layer Settings with no selection, New Comp from Selection with hostile overlap). - Docs: docs/agents.md "Repro scripts"; AGENTS.md: crash fix regression test = a .jsonl in tests/repros. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit c38509d7dafe507856c48c78db65e00b94b0cebc) (cherry picked from commit e55b56dbf76716adfcbfe4cc773df19a74edc419) (cherry picked from commit96a63855a9) (cherry picked from commit c59351ab3bd697f0868e41230dd883960d94a540) * xtask: ci and ci --affected run cargo test and nextest with --no-fail-fast One run now lists every failing crate instead of stopping at the first. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019qXL3GPNnY9BSFF2XoU2Yu (cherry picked from commit e46c7debe738eca62b35bf7392ab77637f6a33ae) * Agents: confinement write-checks journal.export, help.exportRepro and file.exportTimeline Review on #859 (split into this PR): their output paths were only read-checked (relative ones not at all). Test: confinement_covers_every_command_that_writes_a_file. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014d65YdNxQmjRkbXRtP2NwH * #1224: handle bin-only CI targets and BOM repros without weakening timing tests * #1224: run the full gate when nextest policy changes --------- Co-authored-by: Elias <hakifx91@gmail.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: FredApps <FredApps@users.noreply.github.com> Co-authored-by: FredApps <153173854+FredApps@users.noreply.github.com>
765 lines
35 KiB
Rust
765 lines
35 KiB
Rust
//! `cargo xtask ci --affected [--base REV] [--dry-run]`: the CI gates, run only for the crates a
|
|
//! change can affect (docs/testing.md).
|
|
//!
|
|
//! 1. Changed files: everything that differs from the base (default: the merge-base with `main`),
|
|
//! committed, staged, unstaged or untracked.
|
|
//! 2. Files map to the workspace package whose directory holds them, and to every package whose
|
|
//! sources point at them with a `../` path (`include_bytes!("../../../assets/fonts/…")`,
|
|
//! `env!("CARGO_MANIFEST_DIR")` + `"/../../docs/effects.md"`, …).
|
|
//! 3. Affected = those packages, every package that depends on them (transitively, through
|
|
//! normal and build dependencies) and every package that has one of them as a dev-dependency.
|
|
//! 4. Workspace-wide inputs (root `Cargo.toml`, `Cargo.lock`, `.cargo/`, `xtask/`, the toolchain
|
|
//! file, `clippy.toml`, `.config/nextest.toml`) fall back to the full `cargo xtask ci`.
|
|
|
|
use std::collections::BTreeSet;
|
|
use std::path::Path;
|
|
use std::process::Command;
|
|
use std::time::{Duration, Instant};
|
|
|
|
use serde_json::Value;
|
|
|
|
/// A workspace package, as far as change mapping cares.
|
|
#[derive(Debug, Clone, Default)]
|
|
pub struct Pkg {
|
|
pub name: String,
|
|
/// Package directory relative to the workspace root, `/`-separated, no trailing slash.
|
|
pub dir: String,
|
|
/// Workspace (path) dependencies: (package name, is a dev-dependency).
|
|
pub deps: Vec<(String, bool)>,
|
|
/// Has a library target (`--lib` is valid even when doctests are disabled).
|
|
pub has_lib: bool,
|
|
/// Has a library target with doctests (`cargo test --doc` runs for it).
|
|
pub has_doctests: bool,
|
|
/// Repo paths outside `dir` that the sources read (files or directories).
|
|
pub inputs: Vec<String>,
|
|
}
|
|
|
|
/// Changes to these force the full CI: they can change every crate's build or test policy.
|
|
pub fn full_ci_reason(path: &str) -> Option<&'static str> {
|
|
match path {
|
|
"Cargo.toml" => Some("workspace Cargo.toml changed"),
|
|
"Cargo.lock" => Some("Cargo.lock changed"),
|
|
"rust-toolchain" | "rust-toolchain.toml" => Some("toolchain changed"),
|
|
"clippy.toml" => Some("clippy.toml changed"),
|
|
// Test selection and required runner versions apply to the whole workspace.
|
|
".config/nextest.toml" => Some("nextest configuration changed"),
|
|
_ if path.starts_with(".cargo/") => Some(".cargo/ changed"),
|
|
_ if path.starts_with("xtask/") => Some("xtask changed"),
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
/// Files the `assets` check looks at (see `assets()` in main.rs).
|
|
pub fn is_asset_related(path: &str) -> bool {
|
|
path == "ATTRIBUTION.md" || path.ends_with(".attribution") || crate::is_asset(path)
|
|
}
|
|
|
|
fn under(path: &str, dir: &str) -> bool {
|
|
dir.is_empty() || path == dir || path.strip_prefix(dir).is_some_and(|r| r.starts_with('/'))
|
|
}
|
|
|
|
/// The package whose directory holds `path` (the innermost one).
|
|
pub fn owner<'a>(path: &str, pkgs: &'a [Pkg]) -> Option<&'a Pkg> {
|
|
pkgs.iter().filter(|p| !p.dir.is_empty() && under(path, &p.dir)).max_by_key(|p| p.dir.len())
|
|
}
|
|
|
|
/// Packages whose sources read `path` from outside their own directory.
|
|
pub fn readers<'a>(path: &'a str, pkgs: &'a [Pkg]) -> impl Iterator<Item = &'a Pkg> + 'a {
|
|
pkgs.iter().filter(move |p| p.inputs.iter().any(|i| under(path, i)))
|
|
}
|
|
|
|
/// `direct` plus everything that depends on it: transitively through normal/build edges, then
|
|
/// one hop through dev-dependency edges (a dev-dependent's tests rerun, its dependents don't).
|
|
pub fn expand(direct: &BTreeSet<String>, pkgs: &[Pkg]) -> BTreeSet<String> {
|
|
let mut out = direct.clone();
|
|
let mut stack: Vec<String> = direct.iter().cloned().collect();
|
|
while let Some(n) = stack.pop() {
|
|
for p in pkgs {
|
|
if !out.contains(&p.name) && p.deps.iter().any(|(d, dev)| !dev && *d == n) {
|
|
out.insert(p.name.clone());
|
|
stack.push(p.name.clone());
|
|
}
|
|
}
|
|
}
|
|
let dev: Vec<String> = pkgs.iter().filter(|p| p.deps.iter().any(|(d, dev)| *dev && out.contains(d))).map(|p| p.name.clone()).collect();
|
|
out.extend(dev);
|
|
out
|
|
}
|
|
|
|
/// What `ci --affected` will do for a set of changed files.
|
|
#[derive(Debug, Default, PartialEq)]
|
|
pub struct Plan {
|
|
/// Set when the full CI must run instead.
|
|
pub full: Option<String>,
|
|
/// Packages that hold or read a changed file.
|
|
pub direct: BTreeSet<String>,
|
|
/// `direct` and its dependents: clippy and tests run for these.
|
|
pub affected: BTreeSet<String>,
|
|
/// Whether the assets check runs.
|
|
pub assets: bool,
|
|
/// Changed files no package reads (docs, CI configs, packaging…).
|
|
pub unmapped: Vec<String>,
|
|
}
|
|
|
|
pub fn plan(files: &[String], pkgs: &[Pkg]) -> Plan {
|
|
let mut plan = Plan::default();
|
|
for f in files {
|
|
if let Some(why) = full_ci_reason(f) {
|
|
plan.full = Some(format!("{why} ({f})"));
|
|
return plan;
|
|
}
|
|
plan.assets |= is_asset_related(f);
|
|
let mut hit = false;
|
|
for p in owner(f, pkgs).into_iter().chain(readers(f, pkgs)) {
|
|
plan.direct.insert(p.name.clone());
|
|
hit = true;
|
|
}
|
|
if !hit {
|
|
plan.unmapped.push(f.clone());
|
|
}
|
|
}
|
|
plan.affected = expand(&plan.direct, pkgs);
|
|
plan
|
|
}
|
|
|
|
/// Normalise `base/rel` (both `/`-separated, relative to the repo root). None if it leaves the repo.
|
|
pub fn join_rel(base: &str, rel: &str) -> Option<String> {
|
|
let mut parts: Vec<&str> = base.split('/').filter(|s| !s.is_empty() && *s != ".").collect();
|
|
for c in rel.split('/') {
|
|
match c {
|
|
"" | "." => {}
|
|
".." => {
|
|
parts.pop()?;
|
|
}
|
|
c => parts.push(c),
|
|
}
|
|
}
|
|
Some(parts.join("/"))
|
|
}
|
|
|
|
/// The `../…` paths in a line of Rust: the part of each string literal from its first `../`,
|
|
/// cut back to a directory when a format placeholder follows (`"{}/../model/fixtures/{n}"`).
|
|
pub fn rel_paths(line: &str) -> Vec<String> {
|
|
let mut out = vec![];
|
|
for lit in line.split('"').skip(1).step_by(2) {
|
|
let Some(i) = lit.find("../") else { continue };
|
|
let Some(rest) = lit.get(i..) else { continue };
|
|
let p = match rest.find('{') {
|
|
Some(j) => rest.get(..j).and_then(|s| s.rfind('/').and_then(|k| s.get(..k))).unwrap_or(""),
|
|
None => rest,
|
|
};
|
|
let p = p.trim_end_matches('/');
|
|
if !p.is_empty() {
|
|
out.push(p.to_string());
|
|
}
|
|
}
|
|
out
|
|
}
|
|
|
|
/// Repo paths outside `pkg_dir` that a source file at `file` (both repo-relative) points at.
|
|
/// A literal may be relative to the file (`include_bytes!`) or to the manifest dir
|
|
/// (`CARGO_MANIFEST_DIR`), so both are tried. Keep existing paths and paths containing a change,
|
|
/// including deleted files and directories that no longer exist in the working tree.
|
|
pub fn inputs_of(file: &str, pkg_dir: &str, text: &str, known_input: &dyn Fn(&str) -> bool) -> BTreeSet<String> {
|
|
let file_dir = file.rsplit_once('/').map(|(d, _)| d).unwrap_or("");
|
|
let mut out = BTreeSet::new();
|
|
for line in text.lines().filter(|l| l.contains("../")) {
|
|
let t = line.trim_start();
|
|
if t.starts_with("//") && !t.starts_with("///") && !t.starts_with("//!") {
|
|
continue;
|
|
}
|
|
for rel in rel_paths(line) {
|
|
for base in [file_dir, pkg_dir] {
|
|
let Some(p) = join_rel(base, &rel) else { continue };
|
|
if p.is_empty() || p == "target" || p.starts_with("target/") || under(&p, pkg_dir) || !known_input(&p) {
|
|
continue;
|
|
}
|
|
out.insert(p);
|
|
}
|
|
}
|
|
}
|
|
out
|
|
}
|
|
|
|
fn rs_files(dir: &Path, out: &mut Vec<std::path::PathBuf>, depth: u32) {
|
|
if depth > 32 {
|
|
return;
|
|
}
|
|
for e in std::fs::read_dir(dir).into_iter().flatten().flatten() {
|
|
let p = e.path();
|
|
let name = e.file_name();
|
|
if p.is_dir() {
|
|
if name != "target" && name != ".git" {
|
|
rs_files(&p, out, depth + 1);
|
|
}
|
|
} else if p.extension().is_some_and(|x| x == "rs") {
|
|
out.push(p);
|
|
}
|
|
}
|
|
}
|
|
|
|
fn rel_to(root: &Path, p: &Path) -> String {
|
|
p.strip_prefix(root).unwrap_or(p).components().map(|c| c.as_os_str().to_string_lossy().into_owned()).collect::<Vec<_>>().join("/")
|
|
}
|
|
|
|
/// Workspace packages (xtask excluded) with their path dependencies and outside inputs.
|
|
pub fn packages(root: &Path, md: &Value, changed: &[String]) -> Vec<Pkg> {
|
|
let ws = md["workspace_root"].as_str().map(Path::new).unwrap_or(root);
|
|
let names: BTreeSet<&str> = md["packages"].as_array().into_iter().flatten().filter_map(|p| p["name"].as_str()).collect();
|
|
let mut pkgs = vec![];
|
|
for p in md["packages"].as_array().into_iter().flatten() {
|
|
let Some(name) = p["name"].as_str().filter(|n| *n != "xtask") else { continue };
|
|
let Some(dir) = p["manifest_path"].as_str().and_then(|m| Path::new(m).parent()) else { continue };
|
|
let deps = p["dependencies"]
|
|
.as_array()
|
|
.into_iter()
|
|
.flatten()
|
|
.filter(|d| !d["path"].is_null())
|
|
.filter_map(|d| d["name"].as_str().filter(|n| names.contains(n)).map(|n| (n.to_string(), d["kind"] == "dev")))
|
|
.collect();
|
|
let lib_kind = |k: &Value| ["lib", "rlib", "dylib", "cdylib", "staticlib", "proc-macro"].iter().any(|l| k == *l);
|
|
let libs: Vec<&Value> = p["targets"].as_array().into_iter().flatten().filter(|t| t["kind"].as_array().into_iter().flatten().any(lib_kind)).collect();
|
|
let has_lib = !libs.is_empty();
|
|
let has_doctests = libs.iter().any(|t| t["doctest"] != false);
|
|
let rel = rel_to(ws, dir);
|
|
let mut files = vec![];
|
|
rs_files(dir, &mut files, 0);
|
|
let known_input = |p: &str| ws.join(p).exists() || changed.iter().any(|f| under(f, p));
|
|
let mut inputs = BTreeSet::new();
|
|
for f in files {
|
|
if let Ok(text) = std::fs::read_to_string(&f) {
|
|
inputs.extend(inputs_of(&rel_to(ws, &f), &rel, &text, &known_input));
|
|
}
|
|
}
|
|
pkgs.push(Pkg { name: name.to_string(), dir: rel, deps, has_lib, has_doctests, inputs: inputs.into_iter().collect() });
|
|
}
|
|
pkgs
|
|
}
|
|
|
|
fn git(root: &Path, args: &[&str]) -> Result<String, String> {
|
|
let out = Command::new("git").arg("-C").arg(root).args(args).output().map_err(|e| format!("git: {e}"))?;
|
|
if !out.status.success() {
|
|
return Err(format!("git {}: {}", args.join(" "), String::from_utf8_lossy(&out.stderr).trim()));
|
|
}
|
|
String::from_utf8(out.stdout).map_err(|e| format!("git {}: output is not UTF-8; cannot safely map changed paths: {e}", args.join(" ")))
|
|
}
|
|
|
|
/// The base commit: `--base REV` or the merge-base of HEAD with `main` (or `origin/main`).
|
|
fn base(root: &Path, rev: Option<&str>) -> Result<(String, String), String> {
|
|
if let Some(r) = rev {
|
|
let sha = git(root, &["rev-parse", "--verify", &format!("{r}^{{commit}}")])?;
|
|
return Ok((sha.trim().to_string(), r.to_string()));
|
|
}
|
|
for m in ["main", "origin/main"] {
|
|
if let Ok(sha) = git(root, &["merge-base", "HEAD", m]) {
|
|
return Ok((sha.trim().to_string(), format!("merge-base with {m}")));
|
|
}
|
|
}
|
|
Err("no merge-base with main or origin/main; pass --base REV".into())
|
|
}
|
|
|
|
/// Committed since `base`, staged, unstaged and untracked files (repo-relative, sorted).
|
|
fn changed_files(root: &Path, base: &str) -> Result<Vec<String>, String> {
|
|
let diff = git(root, &["diff", "--name-only", "--no-renames", "-z", base, "--"])?;
|
|
let untracked = git(root, &["ls-files", "--others", "--exclude-standard", "-z"])?;
|
|
// Git otherwise C-quotes Unicode, tabs and newlines. Whitespace is part of the filename.
|
|
let set: BTreeSet<String> = diff.split('\0').chain(untracked.split('\0')).filter(|p| !p.is_empty()).map(str::to_string).collect();
|
|
Ok(set.into_iter().collect())
|
|
}
|
|
|
|
fn short_list(names: &BTreeSet<String>) -> String {
|
|
if names.is_empty() { "none".into() } else { names.iter().map(|n| crate::short(n)).collect::<Vec<_>>().join(", ") }
|
|
}
|
|
|
|
fn first_few(files: &[String]) -> String {
|
|
let mut s = files.iter().take(3).cloned().collect::<Vec<_>>().join(", ");
|
|
if files.len() > 3 {
|
|
s.push_str(&format!(", … (+{})", files.len() - 3));
|
|
}
|
|
s
|
|
}
|
|
|
|
/// One CI step: label and the cargo invocation (None = an in-process check).
|
|
struct Step {
|
|
label: String,
|
|
cmd: Option<Command>,
|
|
check: Option<Box<dyn Fn() -> Result<(), String>>>,
|
|
}
|
|
|
|
fn cargo(args: &[&str], pkgs: &[&String], tail: &[&str]) -> Command {
|
|
let mut c = Command::new(env!("CARGO"));
|
|
c.args(args);
|
|
for p in pkgs {
|
|
c.args(["-p", p.as_str()]);
|
|
}
|
|
c.args(tail);
|
|
c
|
|
}
|
|
|
|
/// Library tests and doctests are independent: a library can opt out of doctests.
|
|
fn test_targets(plan: &Plan, pkgs: &[Pkg]) -> (bool, bool) {
|
|
pkgs.iter().filter(|p| plan.affected.contains(&p.name)).fold((false, false), |(lib, docs), p| (lib || p.has_lib, docs || p.has_doctests))
|
|
}
|
|
|
|
fn steps(plan: &Plan, pkgs: &[Pkg], nextest: bool) -> Vec<Step> {
|
|
let mut v = vec![Step { label: "fmt".into(), cmd: Some(cargo(&["fmt", "--check"], &[], &[])), check: None }];
|
|
let aff: Vec<&String> = plan.affected.iter().collect();
|
|
if !aff.is_empty() {
|
|
v.push(Step { label: "audio backend".into(), cmd: None, check: Some(Box::new(crate::audio_backend)) });
|
|
let n = aff.len();
|
|
v.push(Step { label: format!("clippy ({n})"), cmd: Some(cargo(&["clippy", "--all-targets"], &aff, &["--", "-D", "warnings"])), check: None });
|
|
let (has_lib, doctests) = test_targets(plan, pkgs);
|
|
let selected: Vec<String> = aff.iter().map(|p| p.to_string()).collect();
|
|
v.push(Step { label: format!("tests ({n})"), cmd: None, check: Some(Box::new(move || crate::tests_for(&selected, nextest, has_lib, doctests))) });
|
|
}
|
|
v.push(Step { label: "pdf-deps".into(), cmd: None, check: Some(Box::new(|| crate::pdf_deps::run(&crate::root()))) });
|
|
v.push(Step { label: "lock-patches".into(), cmd: None, check: Some(Box::new(|| crate::lock_patches::run(&crate::root()))) });
|
|
v.push(Step { label: "layers".into(), cmd: None, check: Some(Box::new(crate::layers)) });
|
|
if plan.assets {
|
|
v.push(Step { label: "assets".into(), cmd: None, check: Some(Box::new(crate::assets)) });
|
|
}
|
|
let wasm: Vec<&String> = aff.iter().copied().filter(|a| crate::layer_of(a).is_some_and(|l| l <= 4) || crate::WEB_CRATES.contains(&a.as_str())).collect();
|
|
if !wasm.is_empty() {
|
|
v.push(Step { label: format!("wasm ({})", wasm.len()), cmd: Some(cargo(&["check", "--target", "wasm32-unknown-unknown"], &wasm, &[])), check: None });
|
|
}
|
|
v
|
|
}
|
|
|
|
fn fmt_dur(d: Duration) -> String {
|
|
let s = d.as_secs();
|
|
if s >= 60 { format!("{}m{:02}s", s / 60, s % 60) } else { format!("{:.1}s", d.as_secs_f64()) }
|
|
}
|
|
|
|
fn summary(times: &[(String, Duration, bool)]) {
|
|
let total: Duration = times.iter().map(|t| t.1).sum();
|
|
eprintln!("\nci --affected timing:");
|
|
for (label, d, ok) in times {
|
|
eprintln!(" {:<16} {:>8} {}", label, fmt_dur(*d), if *ok { "ok" } else { "FAILED" });
|
|
}
|
|
eprintln!(" {:<16} {:>8}", "total", fmt_dur(total));
|
|
}
|
|
|
|
pub fn run(root: &Path, args: &[String]) -> Result<(), String> {
|
|
let dry = args.iter().any(|a| a == "--dry-run");
|
|
let rev = match args.iter().position(|a| a == "--base") {
|
|
Some(i) => Some(args.get(i + 1).map(String::as_str).ok_or("--base needs a revision")?),
|
|
None => None,
|
|
};
|
|
let (sha, why) = base(root, rev)?;
|
|
let files = changed_files(root, &sha)?;
|
|
let md = crate::metadata()?;
|
|
let pkgs = packages(root, &md, &files);
|
|
let plan = plan(&files, &pkgs);
|
|
let short_sha = sha.get(..9).unwrap_or(&sha);
|
|
println!("ci --affected: base {short_sha} ({why}), {} changed file(s)", files.len());
|
|
if let Some(reason) = &plan.full {
|
|
println!(" full CI: {reason}");
|
|
if dry {
|
|
return Ok(());
|
|
}
|
|
let t = Instant::now();
|
|
let r = crate::ci();
|
|
summary(&[("full ci".into(), t.elapsed(), r.is_ok())]);
|
|
return r;
|
|
}
|
|
println!(" changed: {}", short_list(&plan.direct));
|
|
println!(" affected: {} ({} of {} crates)", short_list(&plan.affected), plan.affected.len(), pkgs.len());
|
|
if !plan.unmapped.is_empty() {
|
|
println!(" read by no crate: {}", first_few(&plan.unmapped));
|
|
}
|
|
let nextest = Command::new(env!("CARGO")).args(["nextest", "--version"]).output().is_ok_and(|o| o.status.success());
|
|
let steps = steps(&plan, &pkgs, nextest);
|
|
let labels: Vec<&str> = steps.iter().map(|s| s.label.as_str()).collect();
|
|
println!(" steps: {}{}", labels.join(", "), if plan.assets { "" } else { " (assets skipped: no asset changes)" });
|
|
if dry {
|
|
return Ok(());
|
|
}
|
|
let mut times = vec![];
|
|
let mut failed = vec![];
|
|
for mut s in steps {
|
|
let t = Instant::now();
|
|
let r = match (s.cmd.as_mut(), s.check) {
|
|
(Some(c), _) => crate::run(c),
|
|
(None, Some(f)) => f(),
|
|
(None, None) => Ok(()),
|
|
};
|
|
if let Err(e) = &r {
|
|
eprintln!("ci --affected: {} failed: {e}", s.label);
|
|
failed.push(s.label.clone());
|
|
}
|
|
times.push((s.label, t.elapsed(), r.is_ok()));
|
|
}
|
|
summary(×);
|
|
if failed.is_empty() { Ok(()) } else { Err(format!("ci --affected failed: {}", failed.join(", "))) }
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
fn pkg(name: &str, dir: &str, deps: &[(&str, bool)], inputs: &[&str]) -> Pkg {
|
|
Pkg {
|
|
name: name.into(),
|
|
dir: dir.into(),
|
|
deps: deps.iter().map(|(d, dev)| (d.to_string(), *dev)).collect(),
|
|
has_lib: true,
|
|
has_doctests: true,
|
|
inputs: inputs.iter().map(|s| s.to_string()).collect(),
|
|
}
|
|
}
|
|
|
|
/// time ← render ← engine ← ui ← app; host has engine as a dev-dependency; text reads fonts.
|
|
fn ws() -> Vec<Pkg> {
|
|
vec![
|
|
pkg("effectcraft-time", "crates/time", &[], &[]),
|
|
pkg("effectcraft-text", "crates/text", &[], &["assets/fonts"]),
|
|
pkg("effectcraft-render", "crates/render", &[("effectcraft-time", false), ("effectcraft-text", false)], &[]),
|
|
pkg("effectcraft-engine", "crates/engine", &[("effectcraft-render", false)], &["docs/preferences.md"]),
|
|
pkg("effectcraft-host", "crates/host", &[("effectcraft-time", false), ("effectcraft-engine", true)], &["crates/svg/tests/fixtures"]),
|
|
pkg("effectcraft-ui-egui", "crates/ui-egui", &[("effectcraft-engine", false)], &[]),
|
|
pkg("effectcraft", "apps/effectcraft", &[("effectcraft-ui-egui", false)], &[]),
|
|
pkg("effectcraft-cli", "apps/effectcraft-cli", &[("effectcraft", false)], &[]),
|
|
pkg("effectcraft-svg", "crates/svg", &[], &[]),
|
|
]
|
|
}
|
|
|
|
fn set(v: &[&str]) -> BTreeSet<String> {
|
|
v.iter().map(|s| s.to_string()).collect()
|
|
}
|
|
|
|
fn files(v: &[&str]) -> Vec<String> {
|
|
v.iter().map(|s| s.to_string()).collect()
|
|
}
|
|
|
|
#[test]
|
|
fn file_maps_to_innermost_package() {
|
|
let mut p = ws();
|
|
p.push(pkg("nested", "crates/time/nested", &[], &[]));
|
|
assert_eq!(owner("crates/time/src/lib.rs", &p).map(|p| p.name.as_str()), Some("effectcraft-time"));
|
|
assert_eq!(owner("crates/time/nested/src/lib.rs", &p).map(|p| p.name.as_str()), Some("nested"));
|
|
// a prefix of the dir name is not a match
|
|
assert_eq!(owner("crates/timeline/src/lib.rs", &p).map(|p| p.name.as_str()), None);
|
|
assert_eq!(owner("apps/effectcraft-cli/src/main.rs", &p).map(|p| p.name.as_str()), Some("effectcraft-cli"));
|
|
assert_eq!(owner("apps/effectcraft/src/main.rs", &p).map(|p| p.name.as_str()), Some("effectcraft"));
|
|
assert!(owner("docs/testing.md", &p).is_none());
|
|
}
|
|
|
|
#[test]
|
|
fn reverse_deps_follow_normal_edges_and_one_dev_hop() {
|
|
let p = ws();
|
|
// time: render, engine, ui, app, cli via normal edges; host directly; host is not
|
|
// a dependency of anything.
|
|
let a = expand(&set(&["effectcraft-time"]), &p);
|
|
assert_eq!(
|
|
a,
|
|
set(&["effectcraft-time", "effectcraft-render", "effectcraft-engine", "effectcraft-host", "effectcraft-ui-egui", "effectcraft", "effectcraft-cli"])
|
|
);
|
|
// ui-egui: only its dependents
|
|
assert_eq!(expand(&set(&["effectcraft-ui-egui"]), &p), set(&["effectcraft-ui-egui", "effectcraft", "effectcraft-cli"]));
|
|
// engine: host only through its dev-dependency, and nothing beyond host
|
|
let e = expand(&set(&["effectcraft-engine"]), &p);
|
|
assert!(e.contains("effectcraft-host"));
|
|
assert!(!e.contains("effectcraft-time") && !e.contains("effectcraft-render"));
|
|
assert_eq!(expand(&set(&["effectcraft-cli"]), &p), set(&["effectcraft-cli"]));
|
|
assert!(expand(&BTreeSet::new(), &p).is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn workspace_inputs_fall_back_to_full_ci() {
|
|
let p = ws();
|
|
for f in ["Cargo.toml", "Cargo.lock", ".cargo/config.toml", "xtask/src/main.rs", "rust-toolchain.toml", "clippy.toml"] {
|
|
let pl = plan(&files(&["crates/time/src/lib.rs", f]), &p);
|
|
assert!(pl.full.is_some(), "{f}");
|
|
}
|
|
// a crate manifest is not workspace-wide
|
|
assert_eq!(plan(&files(&["crates/time/Cargo.toml"]), &p).full, None);
|
|
assert_eq!(full_ci_reason("docs/xtask.md"), None);
|
|
}
|
|
|
|
#[test]
|
|
fn nextest_policy_alone_requires_full_ci() {
|
|
let pl = plan(&files(&[".config/nextest.toml"]), &ws());
|
|
assert_eq!(pl.full.as_deref(), Some("nextest configuration changed (.config/nextest.toml)"));
|
|
// Only the actual shared test input triggers this fallback, not every config file.
|
|
assert_eq!(full_ci_reason(".config/editor.toml"), None);
|
|
assert_eq!(full_ci_reason("docs/nextest.toml"), None);
|
|
}
|
|
|
|
#[test]
|
|
fn docs_only_changes_affect_nothing() {
|
|
let pl = plan(&files(&["docs/gaps.md", "README.md", ".github/workflows/release.yml"]), &ws());
|
|
assert_eq!(pl.full, None);
|
|
assert!(pl.affected.is_empty());
|
|
assert!(!pl.assets);
|
|
assert_eq!(pl.unmapped.len(), 3);
|
|
}
|
|
|
|
#[test]
|
|
fn files_read_from_outside_map_to_their_readers() {
|
|
let p = ws();
|
|
// docs/preferences.md is read by an engine test
|
|
let pl = plan(&files(&["docs/preferences.md"]), &p);
|
|
assert_eq!(pl.direct, set(&["effectcraft-engine"]));
|
|
assert!(pl.unmapped.is_empty());
|
|
// a font: read by text (directory input), and an asset
|
|
let pl = plan(&files(&["assets/fonts/Inter-Regular.ttf"]), &p);
|
|
assert_eq!(pl.direct, set(&["effectcraft-text"]));
|
|
assert!(pl.assets);
|
|
assert!(pl.affected.contains("effectcraft-cli"));
|
|
// svg fixtures belong to svg and are read by host
|
|
let pl = plan(&files(&["crates/svg/tests/fixtures/basic-shapes.svg"]), &p);
|
|
assert_eq!(pl.direct, set(&["effectcraft-svg", "effectcraft-host"]));
|
|
}
|
|
|
|
#[test]
|
|
fn asset_rules() {
|
|
assert!(is_asset_related("ATTRIBUTION.md"));
|
|
assert!(is_asset_related("crates/engine/scripts/Rename Layers.jsx.attribution"));
|
|
assert!(is_asset_related("docs/brand/artcraft-mark.png"));
|
|
assert!(!is_asset_related("docs/testing.md"));
|
|
assert!(!is_asset_related("crates/time/src/lib.rs"));
|
|
}
|
|
|
|
#[test]
|
|
fn rel_path_extraction() {
|
|
assert_eq!(rel_paths(r#"static F: &[u8] = include_bytes!("../../../assets/fonts/Inter-Regular.ttf");"#), ["../../../assets/fonts/Inter-Regular.ttf"]);
|
|
assert_eq!(rel_paths(r#"let p = concat!(env!("CARGO_MANIFEST_DIR"), "/../../docs/effects.md");"#), ["../../docs/effects.md"]);
|
|
assert_eq!(rel_paths(r#"format!("{}/../model/tests/fixtures/{n}", env!("CARGO_MANIFEST_DIR"))"#), ["../model/tests/fixtures"]);
|
|
assert_eq!(rel_paths(r#"let a = "x"; let b = "../y/z{n}.png";"#), ["../y"]);
|
|
assert!(rel_paths(r#"let s = "no parent here";"#).is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn rel_path_joining() {
|
|
assert_eq!(join_rel("crates/text/src", "../../../assets/fonts/A.ttf").as_deref(), Some("assets/fonts/A.ttf"));
|
|
assert_eq!(join_rel("crates/host", "../model/./tests").as_deref(), Some("crates/model/tests"));
|
|
assert_eq!(join_rel("crates", "../../outside"), None);
|
|
}
|
|
|
|
#[test]
|
|
fn inputs_try_file_and_manifest_dirs() {
|
|
let existing = set(&["assets/fonts/Inter-Regular.ttf", "docs/effects.md", "crates/model/tests/fixtures", "crates/svg/tests/fixtures/a.svg"]);
|
|
let exists = |p: &str| existing.contains(p);
|
|
let src = r#"
|
|
static F: &[u8] = include_bytes!("../../../assets/fonts/Inter-Regular.ttf");
|
|
let p = concat!(env!("CARGO_MANIFEST_DIR"), "/../../docs/effects.md");
|
|
let fx = format!("{}/../model/tests/fixtures/{n}", env!("CARGO_MANIFEST_DIR"));
|
|
let own = include_bytes!("../tests/fixtures/own.svg");
|
|
let out = Path::new(env!("CARGO_MANIFEST_DIR")).join("../../target/test-out");
|
|
// let commented = include_bytes!("../../svg/tests/fixtures/a.svg");
|
|
"#;
|
|
let got = inputs_of("crates/host/src/lib.rs", "crates/host", src, &exists);
|
|
assert_eq!(got, set(&["assets/fonts/Inter-Regular.ttf", "docs/effects.md", "crates/model/tests/fixtures"]));
|
|
// integration tests in tests/ resolve include_bytes! against tests/
|
|
let got = inputs_of("crates/host/tests/v.rs", "crates/host", r#"include_bytes!("../../svg/tests/fixtures/a.svg")"#, &exists);
|
|
assert_eq!(got, set(&["crates/svg/tests/fixtures/a.svg"]));
|
|
}
|
|
|
|
fn committed_repo() -> tempfile::TempDir {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let root = dir.path();
|
|
git(root, &["init", "-q"]).unwrap();
|
|
git(root, &["config", "core.quotepath", "true"]).unwrap();
|
|
std::fs::write(root.join("README.md"), "fixture\n").unwrap();
|
|
commit_fixture(root);
|
|
dir
|
|
}
|
|
|
|
fn commit_fixture(root: &Path) {
|
|
git(root, &["add", "--all"]).unwrap();
|
|
git(root, &["-c", "user.name=Test", "-c", "user.email=test@example.invalid", "-c", "commit.gpgsign=false", "commit", "--no-verify", "-qm", "fixture"])
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn changed_files_preserve_unicode_in_tracked_and_untracked_paths() {
|
|
let dir = committed_repo();
|
|
let root = dir.path();
|
|
let tracked = "crates/time/src/caf\u{e9}.rs";
|
|
let untracked = "crates/time/src/\u{65b0}\u{898f}.rs";
|
|
std::fs::create_dir_all(root.join("crates/time/src")).unwrap();
|
|
std::fs::write(root.join(tracked), "before").unwrap();
|
|
commit_fixture(root);
|
|
std::fs::write(root.join(tracked), "after").unwrap();
|
|
std::fs::write(root.join(untracked), "new").unwrap();
|
|
let changed = changed_files(root, "HEAD").unwrap();
|
|
assert_eq!(changed, files(&[tracked, untracked]));
|
|
assert_eq!(plan(&changed, &ws()).direct, set(&["effectcraft-time"]));
|
|
}
|
|
|
|
#[cfg(unix)]
|
|
#[test]
|
|
fn changed_files_preserve_whitespace_quotes_and_backslashes() {
|
|
let dir = committed_repo();
|
|
let root = dir.path();
|
|
let tracked = " tracked\t\"\\name\n ";
|
|
let untracked = " untracked\t\"\\name\n ";
|
|
std::fs::write(root.join(tracked), "before").unwrap();
|
|
commit_fixture(root);
|
|
std::fs::write(root.join(tracked), "after").unwrap();
|
|
std::fs::write(root.join(untracked), "new").unwrap();
|
|
assert_eq!(changed_files(root, "HEAD").unwrap(), files(&[tracked, untracked]));
|
|
}
|
|
|
|
#[cfg(unix)]
|
|
#[test]
|
|
fn changed_files_reject_non_utf8_instead_of_silently_omitting_it() {
|
|
use std::os::unix::ffi::OsStringExt;
|
|
let dir = committed_repo();
|
|
std::fs::write(dir.path().join(std::ffi::OsString::from_vec(b"invalid-\xff.rs".to_vec())), "new").unwrap();
|
|
assert!(changed_files(dir.path(), "HEAD").unwrap_err().contains("not UTF-8"));
|
|
}
|
|
|
|
#[test]
|
|
fn deleted_and_renamed_shared_inputs_still_select_their_readers() {
|
|
for rename in [false, true] {
|
|
let dir = committed_repo();
|
|
let root = dir.path();
|
|
std::fs::create_dir_all(root.join("crates/engine/src")).unwrap();
|
|
std::fs::create_dir_all(root.join("docs/fixtures")).unwrap();
|
|
std::fs::write(root.join("docs/preferences.md"), "preferences").unwrap();
|
|
std::fs::write(root.join("docs/fixtures/example.json"), "{}").unwrap();
|
|
std::fs::write(
|
|
root.join("crates/engine/src/lib.rs"),
|
|
r#"
|
|
const PREFS: &str = include_str!("../../../docs/preferences.md");
|
|
fn fixture(n: &str) -> String { format!("{}/../../docs/fixtures/{n}", env!("CARGO_MANIFEST_DIR")) }
|
|
"#,
|
|
)
|
|
.unwrap();
|
|
commit_fixture(root);
|
|
if rename {
|
|
std::fs::rename(root.join("docs/preferences.md"), root.join("docs/renamed.md")).unwrap();
|
|
std::fs::rename(root.join("docs/fixtures"), root.join("docs/moved")).unwrap();
|
|
} else {
|
|
std::fs::remove_file(root.join("docs/preferences.md")).unwrap();
|
|
std::fs::remove_dir_all(root.join("docs/fixtures")).unwrap();
|
|
}
|
|
let changed = changed_files(root, "HEAD").unwrap();
|
|
let md = serde_json::json!({
|
|
"workspace_root": root,
|
|
"packages": [{
|
|
"name": "effectcraft-engine",
|
|
"manifest_path": root.join("crates/engine/Cargo.toml"),
|
|
"targets": [{"kind": ["lib"], "doctest": true}],
|
|
"dependencies": []
|
|
}]
|
|
});
|
|
let pkgs = packages(root, &md, &changed);
|
|
let engine = pkgs.first().unwrap();
|
|
assert!(engine.inputs.contains(&"docs/preferences.md".into()));
|
|
assert!(engine.inputs.contains(&"docs/fixtures".into()));
|
|
for deleted in ["docs/preferences.md", "docs/fixtures/example.json"] {
|
|
assert!(changed.contains(&deleted.to_string()));
|
|
assert_eq!(plan(&files(&[deleted]), &pkgs).direct, set(&["effectcraft-engine"]));
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn test_runner_keeps_dev_profile_target_selection_and_gpu_isolation() {
|
|
for packages in [vec![], files(&["effectcraft-gpu", "effectcraft-ui-egui"])] {
|
|
for nextest in [false, true] {
|
|
let command = crate::test_command(&packages, nextest, true);
|
|
let args: Vec<_> = command.get_args().map(|a| a.to_string_lossy().into_owned()).collect();
|
|
assert!(!args.iter().any(|a| a == "--release" || a == "--profile"));
|
|
for target in ["--lib", "--bins", "--tests", "--no-fail-fast"] {
|
|
assert!(args.iter().any(|a| a == target));
|
|
}
|
|
assert_eq!(args.iter().any(|a| a == "--workspace"), packages.is_empty());
|
|
for package in &packages {
|
|
assert!(args.windows(2).any(|w| w[0] == "-p" && w[1] == *package));
|
|
}
|
|
assert_eq!(args.windows(2).any(|w| w == ["-E", "not package(effectcraft-gpu)"]), nextest);
|
|
assert_eq!(args.iter().any(|a| a == "--no-tests=pass"), nextest && !packages.is_empty());
|
|
}
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn full_workspace_test_commands_keep_library_tests() {
|
|
for nextest in [false, true] {
|
|
let command = crate::test_command(&[], nextest, false);
|
|
assert!(command.get_args().any(|a| a == "--workspace"));
|
|
assert!(command.get_args().any(|a| a == "--lib"));
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn bin_only_and_doctest_disabled_packages_select_the_right_test_targets() {
|
|
let dir = tempfile::tempdir().unwrap();
|
|
let root = dir.path();
|
|
let md = serde_json::json!({
|
|
"workspace_root": root,
|
|
"packages": [
|
|
{
|
|
"name": "effectcraft-cli",
|
|
"manifest_path": root.join("apps/effectcraft-cli/Cargo.toml"),
|
|
"targets": [{"kind": ["bin"], "doctest": false}],
|
|
"dependencies": []
|
|
},
|
|
{
|
|
"name": "effectcraft-time",
|
|
"manifest_path": root.join("crates/time/Cargo.toml"),
|
|
"targets": [{"kind": ["lib"], "doctest": false}],
|
|
"dependencies": []
|
|
},
|
|
{
|
|
"name": "effectcraft-color",
|
|
"manifest_path": root.join("crates/color/Cargo.toml"),
|
|
"targets": [{"kind": ["lib"], "doctest": true}],
|
|
"dependencies": []
|
|
}
|
|
]
|
|
});
|
|
let pkgs = packages(root, &md, &[]);
|
|
for (name, changed, want_lib, want_doctests) in [
|
|
("effectcraft-cli", "apps/effectcraft-cli/src/main.rs", false, false),
|
|
("effectcraft-time", "crates/time/src/lib.rs", true, false),
|
|
("effectcraft-color", "crates/color/src/lib.rs", true, true),
|
|
] {
|
|
let plan = plan(&files(&[changed]), &pkgs);
|
|
assert_eq!(plan.affected, set(&[name]));
|
|
let (has_lib, doctests) = test_targets(&plan, &pkgs);
|
|
assert_eq!((has_lib, doctests), (want_lib, want_doctests));
|
|
let selected = plan.affected.into_iter().collect::<Vec<_>>();
|
|
for nextest in [false, true] {
|
|
let command = crate::test_command(&selected, nextest, has_lib);
|
|
let args: Vec<_> = command.get_args().map(|a| a.to_string_lossy().into_owned()).collect();
|
|
assert_eq!(args.iter().any(|a| a == "--lib"), want_lib);
|
|
assert!(args.windows(2).any(|w| w == ["-p", name]));
|
|
for target in ["--bins", "--tests", "--no-fail-fast"] {
|
|
assert!(args.iter().any(|a| a == target));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn labels(s: &[Step]) -> Vec<String> {
|
|
s.iter().map(|s| s.label.clone()).collect()
|
|
}
|
|
|
|
#[test]
|
|
fn steps_follow_the_plan() {
|
|
let mut p = ws();
|
|
if let Some(cli) = p.iter_mut().find(|p| p.name == "effectcraft-cli") {
|
|
cli.has_lib = false;
|
|
cli.has_doctests = false;
|
|
}
|
|
// docs only: cheap checks
|
|
assert_eq!(labels(&steps(&plan(&files(&["docs/gaps.md"]), &p), &p, true)), ["fmt", "pdf-deps", "lock-patches", "layers"]);
|
|
// ui-egui (L5, a web crate) and its two app dependents; cli has no doctests
|
|
let s = steps(&plan(&files(&["crates/ui-egui/src/dock.rs"]), &p), &p, true);
|
|
assert_eq!(labels(&s), ["fmt", "audio backend", "clippy (3)", "tests (3)", "pdf-deps", "lock-patches", "layers", "wasm (1)"]);
|
|
let args = |i: usize| s.get(i).and_then(|s| s.cmd.as_ref()).map(|c| c.get_args().map(|a| a.to_string_lossy().into_owned()).collect::<Vec<_>>());
|
|
let clippy = args(2).unwrap_or_default();
|
|
assert!(!clippy.iter().any(|a| a == "--release" || a == "--profile"));
|
|
assert!(clippy.windows(2).any(|w| w == ["-p", "effectcraft-ui-egui"]));
|
|
assert!(clippy.ends_with(&["--".into(), "-D".into(), "warnings".into()]));
|
|
assert!(args(7).unwrap_or_default().windows(2).any(|w| w == ["-p", "effectcraft-ui-egui"]));
|
|
// without nextest: one cargo test step; an asset change adds the assets check
|
|
let s = steps(&plan(&files(&["assets/fonts/A.ttf"]), &p), &p, false);
|
|
assert!(labels(&s).contains(&"tests (7)".to_string()) && labels(&s).contains(&"assets".to_string()));
|
|
}
|
|
}
|