- compare gate: refuse an INCOMPLETE cache, not just an empty one — a partial
R2 fetch (continue-on-error step) previously misreported un-fetched
baselines as ADDED and silently disabled their removed-detection.
- post-discord: a missing report.json now posts "gate SKIPPED", never the
false "✅ no screenshot drift" — a disabled pipeline must look disabled.
- promote: hard-fail on a pre-migration (non-v2) manifest instead of warning;
the warn path could commit manifest hashes never uploaded to R2.
- changelog: tolerate per-image R2 failures (skip + loud note, like the old
git-blob null-skip) instead of aborting the whole post; missing creds warn
+ exit 0 (notification-only workflow); git-show failures are loud errors,
no longer mistaken for "predates the migration".
- version guard: a manifest NEWER than the tooling throws everywhere instead
of reading as a silent no-op.
- manifest ordering: locale-independent code-unit comparator in writer +
checker (localeCompare depends on host locale; writer=dev Mac, checker=CI).
- r2-sync pull: byte-size pre-filter before hashing cached files.
- wasm-build.yml: restore-keys on the baseline cache — manifest changes now
restore the previous tree and download only the delta.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
205 lines
9.6 KiB
TypeScript
205 lines
9.6 KiB
TypeScript
/**
|
|
* Churn-free baseline updater — "promote CI's render".
|
|
*
|
|
* CI's x86 render is the source of truth. This pulls a CI run's screenshots
|
|
* (`gh run download`) — or a local dir via --from — and, for each one, overwrites
|
|
* the cached baseline ONLY when the decoded pixels differ beyond the per-engine
|
|
* floor. Unchanged baselines keep their bytes (never re-encoded), so their hash —
|
|
* and therefore the manifest — sees no churn. New shots are added; baselines with
|
|
* no render are reported as removal candidates and only dropped with --prune.
|
|
*
|
|
* Baselines live in a private R2 bucket (content-addressed; see r2-store.ts).
|
|
* The flow is: sync the local cache from the committed manifest → build/apply
|
|
* the plan locally → upload the updated/added bytes to R2 → regenerate the
|
|
* manifest. Only the manifest diff is committed; R2 objects are immutable and
|
|
* never deleted (--prune removes the manifest entry, old commits still resolve).
|
|
* Needs the READ-WRITE credential pair (see tools/screenshots/README.md).
|
|
*
|
|
* CLI (from tests/):
|
|
* tsx tools/screenshots/promote.ts --run <ci-run-id> [--repo owner/repo] [--prune] [--dry-run]
|
|
* tsx tools/screenshots/promote.ts --from <dir> [--prune] [--dry-run]
|
|
*/
|
|
import * as fs from 'fs';
|
|
import * as os from 'os';
|
|
import * as path from 'path';
|
|
import { execFileSync } from 'child_process';
|
|
import { BASELINE_ROOT, MANIFEST_PATH, floorFor, isIgnored, listEngineKeys, splitKey, type Manifest } from './config';
|
|
import { writeManifest } from './gen-manifest';
|
|
import { diffImages, loadPng } from './image-ops';
|
|
import { hashBytes, missingEnv, storeFromEnv, type R2Store } from './r2-store';
|
|
import { loadManifestV2, pool, pullBaselines } from './r2-sync';
|
|
|
|
/** key (`<engine>/<name>`) → absolute cached baseline path. */
|
|
function baselineIndex(root: string): Map<string, string> {
|
|
const abs = path.join(root, BASELINE_ROOT);
|
|
const index = new Map<string, string>();
|
|
for (const key of listEngineKeys(abs)) index.set(key, path.join(abs, key));
|
|
return index;
|
|
}
|
|
|
|
function loadManifest(root: string): Manifest | undefined {
|
|
const p = path.join(root, MANIFEST_PATH);
|
|
if (!fs.existsSync(p)) return undefined;
|
|
try {
|
|
return JSON.parse(fs.readFileSync(p, 'utf8')) as Manifest;
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
/** Download a CI run's artifact and return the top-level test-results dir holding the shots. */
|
|
function downloadRun(runId: string, repo?: string): string {
|
|
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'promote-'));
|
|
const repoArgs = repo ? ['--repo', repo] : [];
|
|
execFileSync('gh', ['run', 'download', runId, '-D', tmp, ...repoArgs], { stdio: 'inherit' });
|
|
// The artifact stores test-results/** — find that dir; its immediate *.png are the shots
|
|
// (exclude the nested screenshot-diff/ triptychs).
|
|
const stack = [tmp];
|
|
while (stack.length) {
|
|
const dir = stack.pop()!;
|
|
const entries = fs.readdirSync(dir, { withFileTypes: true });
|
|
if (path.basename(dir) === 'test-results') return dir;
|
|
for (const e of entries) if (e.isDirectory()) stack.push(path.join(dir, e.name));
|
|
}
|
|
throw new Error(`no test-results/ dir found in the downloaded artifact under ${tmp}`);
|
|
}
|
|
|
|
type Plan = { updated: string[]; added: string[]; unchanged: string[]; removedCandidates: string[] };
|
|
|
|
function buildPlan(root: string, renderDir: string, manifest?: Manifest): { plan: Plan; apply: () => void } {
|
|
const baselines = baselineIndex(root);
|
|
const rendered = new Set(listEngineKeys(renderDir));
|
|
// Never promote excluded screenshots (e.g. the flaky retinascale fullPage shot).
|
|
for (const key of [...rendered]) if (isIgnored(key)) rendered.delete(key);
|
|
for (const key of [...baselines.keys()]) if (isIgnored(key)) baselines.delete(key);
|
|
const plan: Plan = { updated: [], added: [], unchanged: [], removedCandidates: [] };
|
|
const actions: Array<() => void> = [];
|
|
|
|
for (const key of rendered) {
|
|
const src = path.join(renderDir, key);
|
|
const existing = baselines.get(key);
|
|
if (!existing) {
|
|
const dest = path.join(root, BASELINE_ROOT, key);
|
|
plan.added.push(key);
|
|
actions.push(() => {
|
|
fs.mkdirSync(path.dirname(dest), { recursive: true });
|
|
fs.copyFileSync(src, dest); // verbatim bytes
|
|
});
|
|
continue;
|
|
}
|
|
const d = diffImages(loadPng(existing), loadPng(src));
|
|
const floor = floorFor(key);
|
|
if (!d.dimsMatch || d.changedRatio > floor.changedRatio) {
|
|
plan.updated.push(key);
|
|
actions.push(() => fs.copyFileSync(src, existing)); // verbatim bytes, no re-encode → no churn
|
|
} else {
|
|
plan.unchanged.push(key); // leave the cached file untouched
|
|
}
|
|
}
|
|
|
|
// Removal candidates: a manifest-listed baseline this render didn't produce.
|
|
for (const [key, abs] of baselines) {
|
|
if (rendered.has(key)) continue;
|
|
const { engine, name } = splitKey(key);
|
|
if (manifest && !manifest.screenshots.some((e) => e.name === name && e.engine === engine)) continue;
|
|
plan.removedCandidates.push(key);
|
|
actions.push(() => {}); // pruning is opt-in (see main)
|
|
void abs;
|
|
}
|
|
|
|
return { plan, apply: () => actions.forEach((a) => a()) };
|
|
}
|
|
|
|
/** Upload the applied updated/added baselines to R2 (skip-if-exists per hash). */
|
|
async function uploadApplied(root: string, store: R2Store, keys: string[]): Promise<number> {
|
|
let uploaded = 0;
|
|
await pool(keys, 8, async (key) => {
|
|
const bytes = fs.readFileSync(path.join(root, BASELINE_ROOT, key));
|
|
if ((await store.put(hashBytes(bytes), bytes)) === 'uploaded') uploaded++;
|
|
});
|
|
return uploaded;
|
|
}
|
|
|
|
function parseArgs(argv: string[]): Record<string, string | boolean> {
|
|
const out: Record<string, string | boolean> = {};
|
|
for (let i = 0; i < argv.length; i++) {
|
|
const a = argv[i];
|
|
if (a === '--run') out.run = argv[++i];
|
|
else if (a === '--from') out.from = argv[++i];
|
|
else if (a === '--repo') out.repo = argv[++i];
|
|
else if (a === '--prune') out.prune = true;
|
|
else if (a === '--dry-run') out.dryRun = true;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
async function main(): Promise<void> {
|
|
const args = parseArgs(process.argv.slice(2));
|
|
const root = process.cwd();
|
|
if (!args.run && !args.from) {
|
|
console.error('usage: promote.ts --run <ci-run-id> [--repo owner/repo] | --from <dir> [--prune] [--dry-run]');
|
|
process.exitCode = 2;
|
|
return;
|
|
}
|
|
// Fail fast BEFORE downloading anything: a promote that can't upload would
|
|
// otherwise leave the manifest referencing hashes that don't exist in R2.
|
|
const store = storeFromEnv();
|
|
if (!store) {
|
|
console.error(`[promote] R2 read-write credentials required: set ${missingEnv().join(', ')}`);
|
|
process.exitCode = 2;
|
|
return;
|
|
}
|
|
// Refuse a pre-migration checkout rather than warn: buildPlan would mark
|
|
// most renders "unchanged" (so never uploaded) while writeManifest pins
|
|
// their hashes anyway — committing a manifest that references objects R2
|
|
// doesn't have. Sync the checkout to a post-migration revision first.
|
|
if (!loadManifestV2(root)) {
|
|
console.error(`[promote] ${MANIFEST_PATH} is not the R2-backed v2 format — refusing to promote on a pre-migration checkout`);
|
|
process.exitCode = 2;
|
|
return;
|
|
}
|
|
// The local tree is a cache — sync it to the committed manifest so the plan
|
|
// diffs against exactly what the manifest pins (a stale/absent cache would
|
|
// otherwise misreport adds/updates).
|
|
const { downloaded, cached, deleted } = await pullBaselines(root, store);
|
|
console.log(`[promote] cache synced: downloaded=${downloaded} cached=${cached} deleted=${deleted}`);
|
|
|
|
const renderDir = args.from ? (args.from as string) : downloadRun(args.run as string, args.repo as string);
|
|
const manifest = loadManifest(root);
|
|
const { plan, apply } = buildPlan(root, renderDir, manifest);
|
|
|
|
console.log(
|
|
`[promote] updated=${plan.updated.length} added=${plan.added.length} ` +
|
|
`unchanged=${plan.unchanged.length} removal-candidates=${plan.removedCandidates.length}`
|
|
);
|
|
for (const n of plan.updated) console.log(` UPDATE ${n}`);
|
|
for (const n of plan.added) console.log(` ADD ${n}`);
|
|
for (const n of plan.removedCandidates) console.log(` REMOVE? ${n}${args.prune ? ' (pruning)' : ' (use --prune to delete)'}`);
|
|
|
|
if (args.dryRun) {
|
|
console.log('[promote] dry-run — no files written, nothing uploaded');
|
|
return;
|
|
}
|
|
apply();
|
|
if (args.prune) {
|
|
const baselines = baselineIndex(root);
|
|
// Prune drops the local file (and, below, the manifest entry). The R2
|
|
// object is deliberately kept — old commits must still resolve it.
|
|
for (const n of plan.removedCandidates) fs.rmSync(baselines.get(n)!, { force: true });
|
|
}
|
|
// Upload BEFORE regenerating the manifest: a failure here leaves at worst an
|
|
// orphaned CAS object, never a committed manifest pointing at a missing hash.
|
|
const uploaded = await uploadApplied(root, store, [...plan.updated, ...plan.added]);
|
|
console.log(`[promote] uploaded ${uploaded} object(s) to R2`);
|
|
// Keep the manifest in lockstep with the baseline tree — a stale manifest silently
|
|
// disables removed-screenshot detection for anything added after the last regen.
|
|
writeManifest(root);
|
|
console.log(`[promote] done — commit the ${MANIFEST_PATH} diff (the only git-visible output)`);
|
|
}
|
|
|
|
if (require.main === module) {
|
|
main().catch((e) => {
|
|
console.error(`[promote] ${(e as Error).message}`);
|
|
process.exitCode = 1;
|
|
});
|
|
}
|