Skip to content

Commit 805255b

Browse files
committed
Use global mirror for CI toolchain e2e
1 parent c3bf861 commit 805255b

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ jobs:
109109
# above so they don't have to reinstall the sandbox.
110110
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
111111
test -x "$MCPP_VENDORED_XLINGS"
112+
# GitHub-hosted runners are outside CN; keep CI toolchain downloads on
113+
# the global mirror while mcpp's default remains CN for fresh local
114+
# sandboxes. E2E tests with their own MCPP_HOME read this variable.
115+
export MCPP_E2E_TOOLCHAIN_MIRROR=GLOBAL
116+
"$MCPP" self config --mirror "$MCPP_E2E_TOOLCHAIN_MIRROR"
117+
"$MCPP" self config
112118
# Pin the global default so test 28 (which exercises the
113119
# default-toolchain path) gets a deterministic GNU answer
114120
# instead of whatever auto-install picks on a fresh sandbox.

tests/e2e/26_toolchain_management.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ out=$("$MCPP" build 2>&1) || rc=$?
3636
[[ "$out" == *"no toolchain configured"* ]] || { echo "FAIL: error not helpful: $out"; exit 1; }
3737

3838
# 3) Install gcc 16.1.0
39+
if [[ -n "${MCPP_E2E_TOOLCHAIN_MIRROR:-}" ]]; then
40+
"$MCPP" self config --mirror "$MCPP_E2E_TOOLCHAIN_MIRROR"
41+
"$MCPP" self config
42+
fi
3943
rc=0
4044
"$MCPP" toolchain install gcc 16.1.0 > /tmp/_inst.log 2>&1 || rc=$?
4145
if [[ $rc -ne 0 ]]; then

0 commit comments

Comments
 (0)