diff options
| author | Derek Mauro <dmauro@google.com> | 2022-06-30 16:53:12 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-06-30 16:53:51 (GMT) |
| commit | 96f51426e4c776a71d0a446c1e4f4c7a5ea921df (patch) | |
| tree | 77d843106365a58280a86d7746d0346ea8507029 /ci | |
| parent | 219af0d535635f173e58d7e8ef197b0bc48b878a (diff) | |
| download | googletest-96f51426e4c776a71d0a446c1e4f4c7a5ea921df.zip googletest-96f51426e4c776a71d0a446c1e4f4c7a5ea921df.tar.gz googletest-96f51426e4c776a71d0a446c1e4f4c7a5ea921df.tar.bz2 | |
Remove support for C++11
v1.12.x is the last branch to support C++11
Future releases will require at least C++14
PiperOrigin-RevId: 458250106
Change-Id: Ibee2248649ff3c13daaa179135887848bf730f3f
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/linux-presubmit.sh | 4 | ||||
| -rw-r--r-- | ci/macos-presubmit.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ci/linux-presubmit.sh b/ci/linux-presubmit.sh index 0ee5670..09abdc8 100644 --- a/ci/linux-presubmit.sh +++ b/ci/linux-presubmit.sh @@ -39,7 +39,7 @@ if [[ -z ${GTEST_ROOT:-} ]]; then fi if [[ -z ${STD:-} ]]; then - STD="c++11 c++14 c++17 c++20" + STD="c++14 c++17 c++20" fi # Test the CMake build @@ -55,7 +55,7 @@ for cc in /usr/local/bin/gcc /opt/llvm/clang/bin/clang; do ${LINUX_LATEST_CONTAINER} \ /bin/bash -c " cmake /src \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -Dgtest_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ diff --git a/ci/macos-presubmit.sh b/ci/macos-presubmit.sh index d6423fa..3b711da 100644 --- a/ci/macos-presubmit.sh +++ b/ci/macos-presubmit.sh @@ -40,7 +40,7 @@ for cmake_off_on in OFF ON; do BUILD_DIR=$(mktemp -d build_dir.XXXXXXXX) cd ${BUILD_DIR} time cmake ${GTEST_ROOT} \ - -DCMAKE_CXX_STANDARD=11 \ + -DCMAKE_CXX_STANDARD=14 \ -Dgtest_build_samples=ON \ -Dgtest_build_tests=ON \ -Dgmock_build_tests=ON \ @@ -53,7 +53,7 @@ done # Test the Bazel build # If we are running on Kokoro, check for a versioned Bazel binary. -KOKORO_GFILE_BAZEL_BIN="bazel-3.7.0-darwin-x86_64" +KOKORO_GFILE_BAZEL_BIN="bazel-5.1.1-darwin-x86_64" if [[ ${KOKORO_GFILE_DIR:-} ]] && [[ -f ${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN} ]]; then BAZEL_BIN="${KOKORO_GFILE_DIR}/${KOKORO_GFILE_BAZEL_BIN}" chmod +x ${BAZEL_BIN} @@ -66,6 +66,7 @@ for absl in 0 1; do ${BAZEL_BIN} test ... \ --copt="-Wall" \ --copt="-Werror" \ + --cxxopt="-std=c++14" \ --define="absl=${absl}" \ --keep_going \ --show_timestamps \ |