From 7cafeff7bddf0430ae1e68ebb6213bb7c5d4a8ec Mon Sep 17 00:00:00 2001
From: Derek Mauro <dmauro@google.com>
Date: Tue, 13 Sep 2022 08:14:45 -0700
Subject: [PATCH] Rollback 4fa8cfe3f4dee8975ee02d98633a5245ab67c6d7

Breaks the intended C++ version on some CI builds

PiperOrigin-RevId: 474022587
Change-Id: I41a58893802c90864e0f2cc3d15e6c169c59146d
---
 .bazelrc                       | 1 -
 .github/workflows/gtest-ci.yml | 9 ++++++---
 ci/linux-presubmit.sh          | 1 +
 ci/macos-presubmit.sh          | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 .bazelrc

diff --git a/.bazelrc b/.bazelrc
deleted file mode 100644
index f93facf0..00000000
--- 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 e61880f9..b2dcab49 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 f6eb9b7d..4eb5bbe4 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 a5d6635a..8f35df58 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 \