File tree 3 files changed +8
-18
lines changed
3 files changed +8
-18
lines changed Original file line number Diff line number Diff line change 15
15
REM Install Bazelisk.
16
16
@ echo %date% %time%
17
17
@ cd github\google-cloud-cpp
18
- @ powershell -exec bypass ci\kokoro\windows\install-bazelisk.ps1
18
+ @ powershell -exec bypass ci\kokoro\windows\lib\ install-bazelisk.ps1
19
19
@ if ERRORLEVEL 1 exit /b 1
20
20
21
21
REM Change PATH to install the Bazelisk version we just installed
22
22
@ set " PATH = C:\bin;%ProgramFiles(x86)% \Google\Cloud SDK\google-cloud-sdk\bin;%PATH% "
23
23
24
24
REM Configure the environment to use MSVC %MSVC_VERSION% and then switch to PowerShell.
25
- if " %KOKORO_JOB_POOL% " == " yoshi-cpp-win" (
26
- call " %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \Community\VC\Auxiliary\Build\vcvars32.bat"
27
- set " BAZEL_VC = %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \Community\VC"
28
- ) else (
29
- call " %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC\Auxiliary\Build\vcvars32.bat"
30
- set " BAZEL_VC = %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC"
31
- set " VCPKG_OVERLAY_TRIPLETS = %cd% \ci\kokoro\windows\triplets"
32
- )
25
+ call " %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC\Auxiliary\Build\vcvars32.bat"
26
+ set " BAZEL_VC = %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC"
27
+ set " VCPKG_OVERLAY_TRIPLETS = %cd% \ci\kokoro\windows\triplets"
33
28
34
29
REM The remaining of the build script is implemented in PowerShell.
35
30
@ echo %date% %time%
Original file line number Diff line number Diff line change 15
15
REM Install Bazelisk.
16
16
@ echo %date% %time%
17
17
@ cd github\google-cloud-cpp
18
- @ powershell -exec bypass ci\kokoro\windows\install-bazelisk.ps1
18
+ @ powershell -exec bypass ci\kokoro\windows\lib\ install-bazelisk.ps1
19
19
@ if ERRORLEVEL 1 exit /b 1
20
20
21
21
REM Change PATH to install the Bazelisk version we just installed
22
22
@ set " PATH = C:\bin;%ProgramFiles(x86)% \Google\Cloud SDK\google-cloud-sdk\bin;%PATH% "
23
23
24
24
REM Configure the environment to use MSVC %MSVC_VERSION% and then switch to PowerShell.
25
- if " %KOKORO_JOB_POOL% " == " yoshi-cpp-win" (
26
- call " %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \Community\VC\Auxiliary\Build\vcvars64.bat"
27
- set " BAZEL_VC = %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \Community\VC"
28
- ) else (
29
- call " %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC\Auxiliary\Build\vcvars64.bat"
30
- set " BAZEL_VC = %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC"
31
- set " VCPKG_OVERLAY_TRIPLETS = %cd% \ci\kokoro\windows\triplets"
32
- )
25
+ call " %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC\Auxiliary\Build\vcvars64.bat"
26
+ set " BAZEL_VC = %ProgramFiles(x86)% \Microsoft Visual Studio\%MSVC_VERSION% \BuildTools\VC"
27
+ set " VCPKG_OVERLAY_TRIPLETS = %cd% \ci\kokoro\windows\triplets"
33
28
34
29
REM The remaining of the build script is implemented in PowerShell.
35
30
@ echo %date% %time%
File renamed without changes.
You can’t perform that action at this time.
0 commit comments