Skip to content

Commit df1691a

Browse files
committed
fix(ci): move 14.51 OUT of the toolset directory, not rename it inside
Renaming in place did not hide it. mcpp enumerates every child of `VC\Tools\MSVC`, so `14.51.36231.disabled-see-mcpp-609` was still a candidate — and still sorted last, so still chosen. The log named it outright: ...\14.51.36231.disabled-see-mcpp-609\modules\std.ixx:12:10: fatal error: 'assert.h' file not found which is the same header/std.ixx split as before, just with a longer path. The rename changed what the directory is called and not what it is. `Move-Item` to RUNNER_TEMP instead. What made the first attempt wrong is worth keeping: "newest wins" is a scan of that directory, so the only way to take a toolset out of the running is to take it out of the directory.
1 parent 9a922c9 commit df1691a

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

‎.github/workflows/validate.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,8 @@ jobs:
10221022
# mcpp says which lever is the right one: for the SYSTEM origin,
10231023
# "everything about which toolset this picks is a property of the
10241024
# machine, not of the caller" (src/toolchain/msvc.cppm). So change the
1025-
# machine. With 14.51 renamed aside, mcpp's detection and clang's own
1026-
# both land on 14.44 and cannot disagree.
1025+
# machine. With 14.51 moved OUT of that directory, mcpp's detection
1026+
# and clang's own both land on 14.44 and cannot disagree.
10271027
#
10281028
# Ephemeral runner, ephemeral change. `msvc@<toolset>` in a manifest is
10291029
# the per-package way to pin, but this has to hold for every member on
@@ -1037,8 +1037,15 @@ jobs:
10371037
throw "MSVC 14.44.35207 is not on this image; see the emit-windows comment before changing the pin"
10381038
}
10391039
if (Test-Path $bad) {
1040-
Rename-Item -Path $bad -NewName "14.51.36231.disabled-see-mcpp-609"
1041-
Write-Host "moved 14.51.36231 aside"
1040+
# OUT of VC\Tools\MSVC, not renamed inside it. Renaming in
1041+
# place was tried and does not hide anything: mcpp enumerates
1042+
# every child of that directory, so
1043+
# `14.51.36231.disabled-see-mcpp-609` was still found -- and
1044+
# still sorted last, so still chosen. The log named it:
1045+
# `...\14.51.36231.disabled-see-mcpp-609\modules\std.ixx`.
1046+
$park = Join-Path $env:RUNNER_TEMP "msvc-14.51-parked"
1047+
Move-Item -Path $bad -Destination $park -Force
1048+
Write-Host "moved 14.51.36231 out to $park"
10421049
} else {
10431050
Write-Host "14.51.36231 not present; nothing to move"
10441051
}

0 commit comments

Comments
 (0)