Skip to content

Commit bff023d

Browse files
committed
[win][CI] Convert paths to Windows format before adding to PATH
1 parent f5d3fe2 commit bff023d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/ci/scripts/install-mingw.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ if isWindows && isKnownToBeMingwBuild; then
4242

4343
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
4444
7z x -y mingw.7z > /dev/null
45-
ciCommandAddPath "$(pwd)/${mingw_dir}/bin"
45+
ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
4646
fi

src/ci/scripts/install-ninja.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if isWindows; then
1212
7z x -oninja ninja.zip
1313
rm ninja.zip
1414
ciCommandSetEnv "RUST_CONFIGURE_ARGS" "${RUST_CONFIGURE_ARGS} --enable-ninja"
15-
ciCommandAddPath "$(pwd)/ninja"
15+
ciCommandAddPath "$(cygpath -m "$(pwd)/ninja")"
1616
elif isMacOS; then
1717
brew install ninja
1818
fi

src/ci/scripts/install-sccache.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ elif isWindows; then
1515
mkdir -p sccache
1616
curl -fo sccache/sccache.exe \
1717
"${MIRRORS_BASE}/2025-02-24-sccache-v0.10.0-x86_64-pc-windows-msvc.exe"
18-
ciCommandAddPath "$(pwd)/sccache"
18+
ciCommandAddPath "$(cygpath -m "$(pwd)/sccache")"
1919
fi
2020

2121
# FIXME: we should probably install sccache outside the containers and then

0 commit comments

Comments
 (0)