Skip to content

Commit 139503a

Browse files
committed
ci(macos): discover the xlings LLVM version instead of hardcoding 20.1.7
xlings bumped its default llvm to 22.1.8; the hardcoded sandbox link path and toolchain pin made the job fail at 'Configure dev mcpp sandbox' deterministically. Discover the installed version from ~/.xlings/data/xpkgs/xim-x-llvm/*/ and thread it via MCPP_LLVM_VER. (Install step keeps 'xlings install llvm -y || llvm@20.1.7' as fallback.)
1 parent b2a1ca2 commit 139503a

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/ci-macos.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,9 +283,15 @@ jobs:
283283
284284
- name: Configure dev mcpp sandbox to reuse xlings LLVM
285285
run: |
286-
LLVM_PKG="$HOME/.xlings/data/xpkgs/xim-x-llvm/20.1.7"
287-
MCPP_LLVM_LINK="$HOME/.mcpp/registry/data/xpkgs/xim-x-llvm/20.1.7"
286+
# Discover whatever LLVM version `xlings install llvm` provided —
287+
# hardcoding it (20.1.7) broke the job the day xlings bumped its
288+
# default to 22.1.8.
289+
LLVM_PKG=$(ls -d "$HOME/.xlings/data/xpkgs/xim-x-llvm"/*/ 2>/dev/null | head -1)
290+
LLVM_PKG="${LLVM_PKG%/}"
288291
test -d "$LLVM_PKG"
292+
LLVM_VER=$(basename "$LLVM_PKG")
293+
echo "MCPP_LLVM_VER=$LLVM_VER" >> "$GITHUB_ENV"
294+
MCPP_LLVM_LINK="$HOME/.mcpp/registry/data/xpkgs/xim-x-llvm/$LLVM_VER"
289295
printf '1\n' > "$LLVM_PKG/.mcpp_ok"
290296
291297
mkdir -p "$HOME/.mcpp/registry/data/xpkgs/xim-x-llvm"
@@ -345,7 +351,7 @@ jobs:
345351
"$MCPP" self config --mirror "$MCPP_E2E_TOOLCHAIN_MIRROR"
346352
"$MCPP" self config
347353
# macOS default toolchain is LLVM
348-
"$MCPP" toolchain default llvm@20.1.7
354+
"$MCPP" toolchain default "llvm@${MCPP_LLVM_VER}"
349355
bash tests/e2e/run_all.sh
350356
351357
- name: "Toolchain: LLVM — build mcpp (self-host)"
@@ -355,7 +361,7 @@ jobs:
355361
test -x "$MCPP"
356362
cp "$MCPP" /tmp/mcpp-fresh
357363
MCPP=/tmp/mcpp-fresh
358-
"$MCPP" toolchain default llvm@20.1.7
364+
"$MCPP" toolchain default "llvm@${MCPP_LLVM_VER}"
359365
"$MCPP" clean
360366
"$MCPP" build
361367
"$MCPP" --version

0 commit comments

Comments
 (0)