Skip to content

Commit 13b1900

Browse files
derekmaurocopybara-github
authored andcommitted
Remove the Win64 arch from the CMake Generator since
this can't be used with MSVC 2022 We also have to use Python 3.4 since that is what the base image has, however, I will create a new image soon that has a modern version of Python. PiperOrigin-RevId: 520010732 Change-Id: Icf2420fd97d2bbc310382a17793045b6e16d62bb
1 parent 88af49e commit 13b1900

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ci/windows-presubmit.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ SETLOCAL ENABLEDELAYEDEXPANSION
22

33
SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-5.1.1-windows-x86_64.exe
44

5-
SET PATH=C:\Python37;%PATH%
6-
SET BAZEL_PYTHON=C:\python37\python.exe
5+
SET PATH=C:\Python34;%PATH%
6+
SET BAZEL_PYTHON=C:\python34\python.exe
77
SET BAZEL_SH=C:\tools\msys64\usr\bin\bash.exe
88
SET CMAKE_BIN="cmake.exe"
99
SET CTEST_BIN="ctest.exe"
@@ -20,12 +20,12 @@ IF EXIST git\googletest (
2020
IF %errorlevel% neq 0 EXIT /B 1
2121

2222
:: ----------------------------------------------------------------------------
23-
:: CMake Visual Studio 17 2022 Win64
23+
:: CMake
2424
MKDIR cmake_msvc2022
2525
CD cmake_msvc2022
2626

2727
%CMAKE_BIN% .. ^
28-
-G "Visual Studio 17 2022 Win64" ^
28+
-G "Visual Studio 17 2022" ^
2929
-DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^
3030
-DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^
3131
-DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^
@@ -44,7 +44,7 @@ CD ..
4444
RMDIR /S /Q cmake_msvc2022
4545

4646
:: ----------------------------------------------------------------------------
47-
:: Bazel Visual Studio 17 2022 Win64
47+
:: Bazel
4848

4949
SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community
5050
%BAZEL_EXE% test ... ^

0 commit comments

Comments
 (0)