Skip to content

Commit aea86ec

Browse files
committed
CI: expand %ProgramFiles% manually
This expands `%ProgramFiles%` manually since it is getting expanded to `C:\Program Files (x86)` rather than `C:\Program Files` as expected. Although this is less portable, this will at least enable the CI to run properly.
1 parent dea51d6 commit aea86ec

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

utils/build-windows.bat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ call :build_lldb %exitOnError%
6767

6868
call :build_libdispatch %exitOnError%
6969

70-
path %source_root%\icu-%icu_version%\bin64;%install_directory%\bin;%build_root%\swift\bin;%build_root%\swift\libdispatch-prefix\bin;%PATH%;%ProgramFiles%\Git\usr\bin
70+
path %source_root%\icu-%icu_version%\bin64;%install_directory%\bin;%build_root%\swift\bin;%build_root%\swift\libdispatch-prefix\bin;%PATH%;C:\Program Files\Git\usr\bin
7171
call :test_swift %exitOnError%
7272
call :test_libdispatch %exitOnError%
7373

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

113113
goto :eof
@@ -121,7 +121,7 @@ setlocal enableextensions enabledelayedexpansion
121121

122122
set file_name=sqlite-amalgamation-3270200.zip
123123
curl -L -O "https://www.sqlite.org/2019/%file_name%" %exitOnError%
124-
"%ProgramFiles%\Git\usr\bin\unzip.exe" -o %file_name% %exitOnError%
124+
"C:\Program Files\Git\usr\bin\unzip.exe" -o %file_name% %exitOnError%
125125

126126
goto :eof
127127
endlocal

0 commit comments

Comments
 (0)