Skip to content

Commit 8238d2c

Browse files
committed
CI: adjust the temporary drive, unzip path
This uses `T:` for the temporary drive instead of `S:`. This is needed to ensure that the builds on some machines function which already have the `S` drive in use. Use an absolute path to `unzip` to allow us to use the `unzip` from the Git installation rather than relying on MinGW to provide one.
1 parent ead5b95 commit 8238d2c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

utils/build-windows.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ mkdir %full_build_root%
4545

4646
:: Use the shortest path we can for the build directory, to avoid Windows
4747
:: path problems as much as we can.
48-
subst S: /d
49-
subst S: %full_build_root% %exitOnError%
50-
set build_root=S:
48+
subst T: /d
49+
subst T: %full_build_root% %exitOnError%
50+
set build_root=T:
5151
set install_directory=%build_root%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr
5252

5353
call :clone_repositories %exitOnError%
@@ -104,7 +104,7 @@ set file_name=icu4c-%icu_version%-Win64-MSVC2017.zip
104104
curl -L -O "https://github.com/unicode-org/icu/releases/download/release-%icu_version_dashed%/%file_name%" %exitOnError%
105105
:: unzip warns about the paths in the zip using slashes, which raises the
106106
:: errorLevel to 1. We cannot use exitOnError, and have to ignore errors.
107-
unzip -o %file_name% -d "%source_root%\icu-%icu_version%"
107+
"%ProgramFiles%\Git\usr\bin\unzip.exe" -o %file_name% -d "%source_root%\icu-%icu_version%"
108108
exit /b 0
109109

110110
goto :eof
@@ -118,7 +118,7 @@ setlocal enableextensions enabledelayedexpansion
118118

119119
set file_name=sqlite-amalgamation-3270200.zip
120120
curl -L -O "https://www.sqlite.org/2019/%file_name%" %exitOnError%
121-
unzip -o %file_name% %exitOnError%
121+
"%ProgramFiles%\Git\usr\bin\unzip.exe" -o %file_name% %exitOnError%
122122

123123
goto :eof
124124
endlocal

0 commit comments

Comments
 (0)