diff options
| author | Derek Mauro <dmauro@google.com> | 2023-03-27 12:09:24 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-03-27 12:10:12 -0700 |
| commit | 88af49efa72a06d56910d69ecfd87e3b330e5778 (patch) | |
| tree | f00af6d04597d98de3c1513e1c6980c0c916ad78 | |
| parent | e9fb5c7bacc4a25b030569c92ff9f6925288f1c3 (diff) | |
| download | googletest-git-88af49efa72a06d56910d69ecfd87e3b330e5778.tar.gz | |
Migrate CI builds to MSVC 2022
PiperOrigin-RevId: 519792199
Change-Id: Ic821b264bf1aef5e03f22fb0e288dd9d56fd536b
| -rw-r--r-- | ci/windows-presubmit.bat | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ci/windows-presubmit.bat b/ci/windows-presubmit.bat index 8668ff35..5ec4131c 100644 --- a/ci/windows-presubmit.bat +++ b/ci/windows-presubmit.bat @@ -5,9 +5,11 @@ 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 BAZEL_SH=C:\tools\msys64\usr\bin\bash.exe -SET CMAKE_BIN="C:\Program Files\CMake\bin\cmake.exe" -SET CTEST_BIN="C:\Program Files\CMake\bin\ctest.exe" +SET CMAKE_BIN="cmake.exe" +SET CTEST_BIN="ctest.exe" SET CTEST_OUTPUT_ON_FAILURE=1 +SET CMAKE_BUILD_PARALLEL_LEVEL=16 +SET CTEST_PARALLEL_LEVEL=16 IF EXIST git\googletest ( CD git\googletest @@ -18,12 +20,12 @@ IF EXIST git\googletest ( IF %errorlevel% neq 0 EXIT /B 1 :: ---------------------------------------------------------------------------- -:: CMake Visual Studio 15 2017 Win64 -MKDIR cmake_msvc2017 -CD cmake_msvc2017 +:: CMake Visual Studio 17 2022 Win64 +MKDIR cmake_msvc2022 +CD cmake_msvc2022 %CMAKE_BIN% .. ^ - -G "Visual Studio 15 2017 Win64" ^ + -G "Visual Studio 17 2022 Win64" ^ -DPYTHON_EXECUTABLE:FILEPATH=c:\python37\python.exe ^ -DPYTHON_INCLUDE_DIR:PATH=c:\python37\include ^ -DPYTHON_LIBRARY:FILEPATH=c:\python37\lib\site-packages\pip ^ @@ -39,12 +41,12 @@ IF %errorlevel% neq 0 EXIT /B 1 IF %errorlevel% neq 0 EXIT /B 1 CD .. -RMDIR /S /Q cmake_msvc2017 +RMDIR /S /Q cmake_msvc2022 :: ---------------------------------------------------------------------------- -:: Bazel Visual Studio 15 2017 Win64 +:: Bazel Visual Studio 17 2022 Win64 -SET BAZEL_VC=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC +SET BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Community %BAZEL_EXE% test ... ^ --compilation_mode=dbg ^ --copt=/std:c++14 ^ |