Skip to content

Commit 6e92186

Browse files
committed
ci: run MSVC detection step before the LLVM self-host rebuild
The rebuild cleans target/, invalidating the job's $MCPP_SELF fingerprint path — the MSVC step then failed with exit 127 (binary gone).
1 parent b8b3b26 commit 6e92186

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

.github/workflows/ci-windows.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,19 +220,11 @@ jobs:
220220
cd hello_win
221221
"$MCPP_SELF" run
222222
223-
- name: "Toolchain: LLVM — build mcpp (self-host)"
224-
shell: bash
225-
run: |
226-
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
227-
cp "$MCPP_SELF" /tmp/mcpp-fresh.exe
228-
MCPP=/tmp/mcpp-fresh.exe
229-
"$MCPP" toolchain default llvm@20.1.7
230-
"$MCPP" clean --bmi-cache
231-
"$MCPP" build 2>&1 | tee build.log; grep -q "Resolved llvm@20.1.7" build.log
232-
233223
# windows-latest ships VS 2022 Enterprise with the VC workload, so
234224
# msvc@system detection MUST succeed here — a failure is a regression
235225
# in the discovery/identification chain (vswhere → env → paths).
226+
# Runs BEFORE the LLVM self-host rebuild: that step cleans + rebuilds
227+
# target/, invalidating this job's $MCPP_SELF fingerprint path.
236228
- name: "Toolchain: MSVC — detection & selection (msvc@system)"
237229
shell: bash
238230
run: |
@@ -265,6 +257,16 @@ jobs:
265257
cd "$GITHUB_WORKSPACE"
266258
"$MCPP_SELF" toolchain default llvm@20.1.7
267259
260+
- name: "Toolchain: LLVM — build mcpp (self-host)"
261+
shell: bash
262+
run: |
263+
export MCPP_VENDORED_XLINGS="$XLINGS_BIN"
264+
cp "$MCPP_SELF" /tmp/mcpp-fresh.exe
265+
MCPP=/tmp/mcpp-fresh.exe
266+
"$MCPP" toolchain default llvm@20.1.7
267+
"$MCPP" clean --bmi-cache
268+
"$MCPP" build 2>&1 | tee build.log; grep -q "Resolved llvm@20.1.7" build.log
269+
268270
- name: Package Windows release zip
269271
id: package
270272
shell: bash

0 commit comments

Comments
 (0)