mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 03:38:23 +00:00
Three conflicts, none resolved by picking a side wholesale: - Makefile: took the incoming ACT_INPUTS, which routes through SWARM_DISTROS instead of inlining the same expression a second time. - test-e2e-playwright/02_run_one.yml: took the incoming rc handling. An absent rc now counts as failure; the previous default(0) let an aborted Playwright run pass silently, contradicting the debug message right above it. - web-app-peertube spec: combined both. Kept gotoOnion and resolveTimeout, which this branch's lint enforces, and adopted the incoming retry-inside-poll for the OIDC button plus its networkidle wait.