diff options
| author | Derek Mauro <dmauro@google.com> | 2022-09-13 15:14:45 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-09-13 15:15:24 (GMT) |
| commit | 7cafeff7bddf0430ae1e68ebb6213bb7c5d4a8ec (patch) | |
| tree | cd9e82ce7f59fb1de0521cd8e3ddb42576b067c0 | |
| parent | 4fa8cfe3f4dee8975ee02d98633a5245ab67c6d7 (diff) | |
| download | googletest-7cafeff7bddf0430ae1e68ebb6213bb7c5d4a8ec.zip googletest-7cafeff7bddf0430ae1e68ebb6213bb7c5d4a8ec.tar.gz googletest-7cafeff7bddf0430ae1e68ebb6213bb7c5d4a8ec.tar.bz2 | |
Rollback 4fa8cfe3f4dee8975ee02d98633a5245ab67c6d7
Breaks the intended C++ version on some CI builds
PiperOrigin-RevId: 474022587
Change-Id: I41a58893802c90864e0f2cc3d15e6c169c59146d
| -rw-r--r-- | .bazelrc | 1 | ||||
| -rw-r--r-- | .github/workflows/gtest-ci.yml | 9 | ||||
| -rw-r--r-- | ci/linux-presubmit.sh | 1 | ||||
| -rw-r--r-- | ci/macos-presubmit.sh | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/.bazelrc b/.bazelrc deleted file mode 100644 index f93facf..0000000 --- a/.bazelrc +++ /dev/null @@ -1 +0,0 @@ -build --cxxopt=-std=c++14 diff --git a/.github/workflows/gtest-ci.yml b/.github/workflows/gtest-ci.yml index e61880f..b2dcab4 100644 --- a/.github/workflows/gtest-ci.yml +++ b/.github/workflows/gtest-ci.yml @@ -4,6 +4,9 @@ on: push: pull_request: +env: + BAZEL_CXXOPTS: -std=c++14 + jobs: Linux: runs-on: ubuntu-latest @@ -14,7 +17,7 @@ jobs: fetch-depth: 0 - name: Tests - run: bazel test --features=external_include_paths --test_output=errors ... + run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... MacOs: runs-on: macos-latest @@ -25,7 +28,7 @@ jobs: fetch-depth: 0 - name: Tests - run: bazel test --features=external_include_paths --test_output=errors ... + run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... Windows: @@ -37,4 +40,4 @@ jobs: fetch-depth: 0 - name: Tests - run: bazel test --features=external_include_paths --test_output=errors ... + run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... diff --git a/ci/linux-presubmit.sh b/ci/linux-presubmit.sh index f6eb9b7..4eb5bbe 100644 --- a/ci/linux-presubmit.sh +++ b/ci/linux-presubmit.sh @@ -72,6 +72,7 @@ time docker run \ --workdir="/src" \ --rm \ --env="CC=/usr/local/bin/gcc" \ + --env="BAZEL_CXXOPTS=-std=c++14" \ ${LINUX_GCC_FLOOR_CONTAINER} \ /usr/local/bin/bazel test ... \ --copt="-Wall" \ diff --git a/ci/macos-presubmit.sh b/ci/macos-presubmit.sh index a5d6635..8f35df5 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" \ + --cxxopt="-std=c++14" \ --define="absl=${absl}" \ --features=external_include_paths \ --keep_going \ |