Skip to content

Commit b82dc2a

Browse files
committed
measure: icu with the toolset first on a kept PATH [m3-only]
1 parent 68b3557 commit b82dc2a

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

‎.github/workflows/measure-734.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ env:
2929
jobs:
3030
vcpkg-vs:
3131
name: M1 M2 (Visual Studio)
32+
if: "!contains(github.event.head_commit.message, '[m3-only]')"
3233
runs-on: windows-2025
3334
timeout-minutes: 90
3435
defaults: { run: { shell: bash } }
@@ -220,6 +221,11 @@ jobs:
220221
setenv "$TOOLS"
221222
run zlib "M3 managed, CMake port" a
222223
run icu "M3 managed, make port" a
224+
# The make-based port finds link.exe on PATH; vcpkg keeps the caller's PATH
225+
# only through VCPKG_KEEP_ENV_VARS.
226+
( export PATH="$TOOLS/bin/Hostx64/x64:$SDK/bin/$SDKVER/x64:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0"
227+
export VCPKG_KEEP_ENV_VARS=PATH
228+
run icu "M3 managed, make port, toolset first on a kept PATH" k )
223229
# P3: the same toolset at another path; a restore means the same ABI hash.
224230
cp -r "$TOOLS" "$RUNNER_TEMP/tc2"
225231
setenv "$RUNNER_TEMP/tc2"
@@ -232,7 +238,7 @@ jobs:
232238

233239
mcpp-legs:
234240
name: E2b E4 (mcpp 2026.9.28.2)
235-
if: "!contains(github.event.head_commit.message, '[vcpkg-only]')"
241+
if: "!contains(github.event.head_commit.message, '[vcpkg-only]') && !contains(github.event.head_commit.message, '[m3-only]')"
236242
runs-on: windows-2025
237243
timeout-minutes: 120
238244
defaults: { run: { shell: bash } }

0 commit comments

Comments
 (0)