Skip to content

Commit 3ef47e6

Browse files
committed
fix: set MCPP_HOME across all steps to share sandbox with LLVM toolchain
1 parent 365f047 commit 3ef47e6

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

.github/workflows/ci-windows.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ jobs:
6464
shell: bash
6565
run: |
6666
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
67+
export MCPP_HOME="$USERPROFILE/.mcpp"
6768
6869
# Pre-seed mcpp sandbox with xlings LLVM (avoids redundant download)
69-
MCPP_XPKGS="$USERPROFILE/.mcpp/registry/data/xpkgs"
70+
MCPP_XPKGS="$MCPP_HOME/registry/data/xpkgs"
7071
XLINGS_XPKGS="$USERPROFILE/.xlings/data/xpkgs"
7172
if [ -d "$XLINGS_XPKGS/xim-x-llvm" ]; then
7273
mkdir -p "$MCPP_XPKGS"
@@ -85,6 +86,8 @@ jobs:
8586
echo "Self-hosted binary: $MCPP_FRESH"
8687
"$MCPP_FRESH" --version
8788
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
89+
# Share the sandbox from self-host build (has LLVM toolchain)
90+
export MCPP_HOME="$USERPROFILE/.mcpp"
8891
"$MCPP_FRESH" test
8992
9093
- name: E2E suite
@@ -94,6 +97,7 @@ jobs:
9497
MCPP=$(cd "$(dirname "$MCPP")" && pwd)/$(basename "$MCPP")
9598
test -f "$MCPP"
9699
export MCPP
100+
export MCPP_HOME="$USERPROFILE/.mcpp"
97101
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
98102
export MCPP_E2E_TOOLCHAIN_MIRROR=GLOBAL
99103
"$MCPP" self config --mirror "$MCPP_E2E_TOOLCHAIN_MIRROR" 2>/dev/null || true
@@ -106,6 +110,7 @@ jobs:
106110
MCPP=$(find target -name "mcpp.exe" -path "*/bin/*" | head -1)
107111
MCPP=$(cd "$(dirname "$MCPP")" && pwd)/$(basename "$MCPP")
108112
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
113+
export MCPP_HOME="$USERPROFILE/.mcpp"
109114
"$MCPP" build
110115
"$MCPP" --version
111116
echo ":: Self-host smoke PASS"

0 commit comments

Comments
 (0)