Skip to content

Commit ec54539

Browse files
committed
fix: reuse macos ci llvm toolchain
1 parent b047012 commit ec54539

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

.github/workflows/ci-macos.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ jobs:
1919
name: macOS ARM64 — xlings LLVM end-to-end
2020
runs-on: macos-15
2121
timeout-minutes: 30
22+
env:
23+
# Match dev mcpp's default home so toolchains installed for CI are
24+
# visible to the freshly-built target/.../bin/mcpp used below.
25+
MCPP_HOME: /Users/runner/.mcpp
2226
steps:
2327
- uses: actions/checkout@v4
2428

@@ -64,6 +68,17 @@ jobs:
6468
echo "LLVM_ROOT=$LLVM_ROOT" >> "$GITHUB_ENV"
6569
echo "CXX=$LLVM_ROOT/bin/clang++" >> "$GITHUB_ENV"
6670
71+
- name: Prime mcpp sandbox with LLVM
72+
run: |
73+
SRC="$HOME/.xlings/data/xpkgs/xim-x-llvm/20.1.7"
74+
DST="$MCPP_HOME/registry/data/xpkgs/xim-x-llvm/20.1.7"
75+
test -d "$SRC"
76+
rm -rf "$DST"
77+
mkdir -p "$(dirname "$DST")"
78+
cp -R "$SRC" "$DST"
79+
printf '1\n' > "$DST/.mcpp_ok"
80+
ls "$DST/bin/clang++"
81+
6782
- name: Inspect LLVM package structure
6883
run: |
6984
echo "=== bin/ ==="

0 commit comments

Comments
 (0)