4e10b9e9c1
Finishes #16 in the three places its earlier remedies missed. `tests/`: the last four local `disc_root()` copies now use `tests/common`, and with them goes the one real hardcoded fallback — `ui_keyframe_record_disc.rs` fell back to an absolute path on one machine, which made `unset SYLPHEED_DISC` a no-op there. Control: with the corpus absent that suite now finishes in 0.00s instead of 57.55s, so it skips rather than finding a disc of its own. `examples/`: seventeen examples defaulted to `/disc`, the mount point inside the CI container. Redundant there — `docker/ci/run` sets `SYLPHEED_DISC=/disc` — and wrong everywhere else, where a missing corpus turned into a file-not-found against a path that has never existed on the host. They now name the variable to set, like the other hundred examples already did. `docker/ci/run`: mount `$SYLPHEED_RES3D` and `$SYLPHEED_ISO` alongside the disc. Only the disc was mounted, so an in-container run sat out the res3d and iso suites while looking like a full one — the defect this issue is about, in the runner itself. Measured in the container on this desktop with all three corpora present: 45 suites / 377 passed / 0 failed / 14 ignored, and `sylpheed-corpus-report.txt` now reports PRESENT for all three rather than for the disc alone. Refs #16. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
56 lines
2.3 KiB
Bash
Executable File
56 lines
2.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Run a command against this repository inside the capped CI container.
|
|
#
|
|
# docker/ci/run cargo check --workspace --all-targets
|
|
# docker/ci/run cargo clippy --workspace --all-targets --keep-going -- -D warnings
|
|
# docker/ci/run bash -c 'cargo fmt --all; cargo fmt --all -- --check | grep -c "^Diff in"'
|
|
#
|
|
# 🔴 EVERY HEAVY COMMAND GOES THROUGH HERE. A bare `cargo build` on the host is
|
|
# unbounded: `CARGO_BUILD_JOBS` caps codegen units, not rustc's own threads, not
|
|
# the linker, not the test harness. A full-parallel build has OOM-crashed this
|
|
# box, and unbounded host runs have frozen it since. The container is the cap
|
|
# that actually holds.
|
|
#
|
|
# Half the machine, no swap. `--memory-swap` equal to `--memory` means a build
|
|
# that would swap is killed instead, which is a fast failure rather than an
|
|
# hour of thrashing that takes the desktop with it.
|
|
set -euo pipefail
|
|
|
|
REPO="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
|
IMAGE="${SYLPH_CI_IMAGE:-sylph-ci:local}"
|
|
CPUS="${SYLPH_CI_CPUS:-6}"
|
|
MEM_GB="${SYLPH_CI_MEM_GB:-7}"
|
|
|
|
args=(
|
|
--rm
|
|
--cpus "$CPUS"
|
|
--memory "${MEM_GB}g"
|
|
--memory-swap "${MEM_GB}g"
|
|
--pids-limit 2048
|
|
-v "$REPO:/work"
|
|
# Named volumes, not bind mounts: the host tree keeps a 32 GB `target/` from
|
|
# earlier host-side builds, and mixing the two produces rebuilds that look
|
|
# like cache misses and are actually two toolchains fighting over one directory.
|
|
-v sylph-ci-cargo:/cargo -e CARGO_HOME=/cargo
|
|
-v sylph-ci-target:/target -e CARGO_TARGET_DIR=/target
|
|
-w /work
|
|
)
|
|
|
|
# The corpora, read-only, when a disc-backed test or the exporter needs them.
|
|
#
|
|
# All three, not just the disc: a suite whose corpus is absent self-skips and
|
|
# still counts as passed, so mounting one of three made an in-container run look
|
|
# like a full one while `res3d` and `iso` suites silently sat out (#16). Each is
|
|
# mounted only when it exists, and `target/sylpheed-corpus-report.txt` says which
|
|
# ones the run actually had.
|
|
DISC="${SYLPHEED_DISC:-$REPO/../sylph_extract}"
|
|
[ -d "$DISC" ] && args+=(-v "$DISC:/disc:ro" -e SYLPHEED_DISC=/disc)
|
|
|
|
RES3D="${SYLPHEED_RES3D:-}"
|
|
[ -n "$RES3D" ] && [ -d "$RES3D" ] && args+=(-v "$RES3D:/res3d:ro" -e SYLPHEED_RES3D=/res3d)
|
|
|
|
ISO="${SYLPHEED_ISO:-}"
|
|
[ -n "$ISO" ] && [ -f "$ISO" ] && args+=(-v "$ISO:/disc.iso:ro" -e SYLPHEED_ISO=/disc.iso)
|
|
|
|
exec docker run "${args[@]}" "$IMAGE" "$@"
|