diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/linux-presubmit.sh | 7 | ||||
| -rw-r--r-- | ci/macos-presubmit.sh | 1 | ||||
| -rw-r--r-- | ci/windows-presubmit.bat | 24 |
3 files changed, 19 insertions, 13 deletions
diff --git a/ci/linux-presubmit.sh b/ci/linux-presubmit.sh index 9e15d9a4..6bac8878 100644 --- a/ci/linux-presubmit.sh +++ b/ci/linux-presubmit.sh @@ -31,8 +31,8 @@ set -euox pipefail -readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20220217" -readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20220621" +readonly LINUX_LATEST_CONTAINER="gcr.io/google.com/absl-177019/linux_hybrid-latest:20230217" +readonly LINUX_GCC_FLOOR_CONTAINER="gcr.io/google.com/absl-177019/linux_gcc-floor:20230120" if [[ -z ${GTEST_ROOT:-} ]]; then GTEST_ROOT="$(realpath $(dirname ${0})/..)" @@ -78,6 +78,7 @@ time docker run \ --copt="-Wall" \ --copt="-Werror" \ --copt="-Wuninitialized" \ + --copt="-Wundef" \ --copt="-Wno-error=pragmas" \ --distdir="/bazel-distdir" \ --features=external_include_paths \ @@ -99,6 +100,7 @@ for std in ${STD}; do --copt="-Wall" \ --copt="-Werror" \ --copt="-Wuninitialized" \ + --copt="-Wundef" \ --define="absl=${absl}" \ --distdir="/bazel-distdir" \ --features=external_include_paths \ @@ -123,6 +125,7 @@ for std in ${STD}; do --copt="-Wall" \ --copt="-Werror" \ --copt="-Wuninitialized" \ + --copt="-Wundef" \ --define="absl=${absl}" \ --distdir="/bazel-distdir" \ --features=external_include_paths \ diff --git a/ci/macos-presubmit.sh b/ci/macos-presubmit.sh index 8f35df58..681ebc2a 100644 --- a/ci/macos-presubmit.sh +++ b/ci/macos-presubmit.sh @@ -66,6 +66,7 @@ for absl in 0 1; do ${BAZEL_BIN} test ... \ --copt="-Wall" \ --copt="-Werror" \ + --copt="-Wundef" \ --cxxopt="-std=c++14" \ --define="absl=${absl}" \ --features=external_include_paths \ diff --git a/ci/windows-presubmit.bat b/ci/windows-presubmit.bat index 8668ff35..48962eb9 100644 --- a/ci/windows-presubmit.bat +++ b/ci/windows-presubmit.bat @@ -2,12 +2,14 @@ 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="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 +MKDIR cmake_msvc2022 +CD cmake_msvc2022 %CMAKE_BIN% .. ^ - -G "Visual Studio 15 2017 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 ^ @@ -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 -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 ^ |