diff options
| author | Derek Mauro <dmauro@google.com> | 2023-03-28 13:27:28 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-28 13:28:10 (GMT) |
| commit | 13b1900717fe93238d615691b6d0d951b0e154c4 (patch) | |
| tree | a2a9d9b3e8748afd6d162e435789827fabb379ee | |
| parent | 88af49efa72a06d56910d69ecfd87e3b330e5778 (diff) | |
| download | googletest-13b1900717fe93238d615691b6d0d951b0e154c4.zip googletest-13b1900717fe93238d615691b6d0d951b0e154c4.tar.gz googletest-13b1900717fe93238d615691b6d0d951b0e154c4.tar.bz2 | |
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
| -rw-r--r-- | ci/windows-presubmit.bat | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/windows-presubmit.bat b/ci/windows-presubmit.bat index 5ec4131..48962eb 100644 --- a/ci/windows-presubmit.bat +++ b/ci/windows-presubmit.bat @@ -2,8 +2,8 @@ SETLOCAL ENABLEDELAYEDEXPANSION SET BAZEL_EXE=%KOKORO_GFILE_DIR%\bazel-5.1.1-windows-x86_64.exe -SET PATH=C:\Python37;%PATH% -SET BAZEL_PYTHON=C:\python37\python.exe +SET PATH=C:\Python34;%PATH% +SET BAZEL_PYTHON=C:\python34\python.exe SET BAZEL_SH=C:\tools\msys64\usr\bin\bash.exe SET CMAKE_BIN="cmake.exe" SET CTEST_BIN="ctest.exe" @@ -20,12 +20,12 @@ IF EXIST git\googletest ( IF %errorlevel% neq 0 EXIT /B 1 :: ---------------------------------------------------------------------------- -:: CMake Visual Studio 17 2022 Win64 +:: CMake MKDIR cmake_msvc2022 CD cmake_msvc2022 %CMAKE_BIN% .. ^ - -G "Visual Studio 17 2022 Win64" ^ + -G "Visual Studio 17 2022" ^ -DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^ -DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^ -DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^ @@ -44,7 +44,7 @@ CD .. RMDIR /S /Q cmake_msvc2022 :: ---------------------------------------------------------------------------- -:: Bazel Visual Studio 17 2022 Win64 +:: Bazel SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community %BAZEL_EXE% test ... ^ |