Skip to content

Commit 9b3f37a

Browse files
committed
fix(ci): adjust for mirror=auto default; don't force verbose in e2e-suite jobs
Follow-up to the mirror=auto fix and MCPP_VERBOSE rollout, fixing 3 e2e regressions surfaced by the previous CI run (75 itself now PASSES): - 38_self_config_mirror.sh: the default seed is now "auto" (defer to xlings' region detection), not "CN". Updated the assertion; explicit --mirror GLOBAL/cn/BAD checks unchanged. - 48_build_error_output.sh / 53_namespaced_cache_label.sh assert mcpp's DEFAULT (quiet) output. Forcing MCPP_VERBOSE=1 in CI broke them. Removed MCPP_VERBOSE from the workflows that run the e2e suite (ci-linux-e2e, ci-macos, ci-windows); kept it where it's diagnostic and safe (ci-fresh-install, ci-aarch64-fresh-install — the cold bootstrap path — plus ci-linux unit tests and cross-build). A test that needs verbose passes --verbose itself. Verified locally: 38/48/53 green.
1 parent 2b4a5c0 commit 9b3f37a

4 files changed

Lines changed: 16 additions & 11 deletions

File tree

.github/workflows/ci-linux-e2e.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,11 @@ jobs:
2828
timeout-minutes: 45
2929
env:
3030
MCPP_HOME: /home/runner/.mcpp
31-
# Verbose every mcpp invocation (incl. those nested in e2e scripts) so CI
32-
# logs carry full diagnostics for failures like a cold index/sandbox
33-
# bootstrap. Honoured via the MCPP_VERBOSE override in src/cli.cppm.
34-
MCPP_VERBOSE: "1"
31+
# NOTE: do NOT force MCPP_VERBOSE here. The e2e suite includes tests that
32+
# assert mcpp's DEFAULT (quiet) output — e.g. 48_build_error_output and
33+
# 53_namespaced_cache_label — which forced verbose would break. Verbose is
34+
# set only in the fresh-install workflows (cold bootstrap, no such asserts).
35+
# A specific test that needs verbose passes `--verbose` itself.
3536
steps:
3637
- uses: actions/checkout@v4
3738

.github/workflows/ci-macos.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
name: macOS ARM64 — xlings LLVM end-to-end
2020
runs-on: macos-15
2121
timeout-minutes: 30
22-
env:
23-
# Verbose every mcpp invocation for richer CI diagnostics (src/cli.cppm).
24-
MCPP_VERBOSE: "1"
22+
# NOTE: no MCPP_VERBOSE here — this job runs the e2e suite, which includes
23+
# tests asserting mcpp's default quiet output (48/53). Verbose is forced only
24+
# in the fresh-install workflows.
2525
steps:
2626
- uses: actions/checkout@v4
2727

.github/workflows/ci-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
timeout-minutes: 45
2222
env:
2323
MCPP_HOME: C:\Users\runneradmin\.mcpp
24-
# Verbose every mcpp invocation for richer CI diagnostics (src/cli.cppm).
25-
MCPP_VERBOSE: "1"
24+
# NOTE: no MCPP_VERBOSE — this job runs the e2e suite, which asserts mcpp's
25+
# default quiet output (48/53). Verbose is forced only in fresh-install.
2626
steps:
2727
- uses: actions/checkout@v4
2828

tests/e2e/38_self_config_mirror.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
1414
exit 1
1515
}
1616

17-
grep -q '"mirror": "CN"' "$MCPP_HOME/registry/.xlings.json" || {
17+
# Default (no explicit --mirror): mcpp seeds "auto" so xlings' own region
18+
# detection (probe github vs gitcode) picks the reachable/faster mirror, instead
19+
# of mcpp hardcoding one. An explicit `mcpp self config --mirror X` still pins a
20+
# concrete value (asserted below).
21+
grep -q '"mirror": "auto"' "$MCPP_HOME/registry/.xlings.json" || {
1822
cat "$MCPP_HOME/registry/.xlings.json"
19-
echo "FAIL: default mirror should be CN"
23+
echo "FAIL: default mirror should be auto (defer to xlings region detection)"
2024
exit 1
2125
}
2226

0 commit comments

Comments
 (0)