Rollback 4fa8cfe

Breaks the intended C++ version on some CI builds PiperOrigin-RevId: 474022587 Change-Id: I41a58893802c90864e0f2cc3d15e6c169c59146d
google · Sep 13, 2022 · 7cafeff · 7cafeff
1 parent 4fa8cfe
commit 7cafeff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.bazelrc b/.bazelrc
diff --git 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
@@ -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
@@ -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 \