Skip to content

Commit 87cb09c

Browse files
authored
ci: cleanup Kokoro+Windows startup scripts (googleapis#9911)
Now that all the builds are in the new pool, we can cleanup the startup scripts. I took the opportunity to move one of the helper scripts to a more suitable location.
1 parent 95d08d0 commit 87cb09c

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

ci/kokoro/windows/build-32.bat

+4-9
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,16 @@
1515
REM Install Bazelisk.
1616
@echo %date% %time%
1717
@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
1919
@if ERRORLEVEL 1 exit /b 1
2020

2121
REM Change PATH to install the Bazelisk version we just installed
2222
@set "PATH=C:\bin;%ProgramFiles(x86)%\Google\Cloud SDK\google-cloud-sdk\bin;%PATH%"
2323

2424
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"
3328

3429
REM The remaining of the build script is implemented in PowerShell.
3530
@echo %date% %time%

ci/kokoro/windows/build.bat

+4-9
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,16 @@
1515
REM Install Bazelisk.
1616
@echo %date% %time%
1717
@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
1919
@if ERRORLEVEL 1 exit /b 1
2020

2121
REM Change PATH to install the Bazelisk version we just installed
2222
@set "PATH=C:\bin;%ProgramFiles(x86)%\Google\Cloud SDK\google-cloud-sdk\bin;%PATH%"
2323

2424
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"
3328

3429
REM The remaining of the build script is implemented in PowerShell.
3530
@echo %date% %time%

0 commit comments

Comments
 (0)