Commit 7cafeff7 authored by Derek Mauro's avatar Derek Mauro Committed by Copybara-Service
Browse files

Rollback 4fa8cfe3

Breaks the intended C++ version on some CI builds

PiperOrigin-RevId: 474022587
Change-Id: I41a58893802c90864e0f2cc3d15e6c169c59146d
parent 4fa8cfe3
build --cxxopt=-std=c++14
...@@ -4,6 +4,9 @@ on: ...@@ -4,6 +4,9 @@ on:
push: push:
pull_request: pull_request:
env:
BAZEL_CXXOPTS: -std=c++14
jobs: jobs:
Linux: Linux:
runs-on: ubuntu-latest runs-on: ubuntu-latest
...@@ -14,7 +17,7 @@ jobs: ...@@ -14,7 +17,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Tests - 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: MacOs:
runs-on: macos-latest runs-on: macos-latest
...@@ -25,7 +28,7 @@ jobs: ...@@ -25,7 +28,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Tests - 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: Windows:
...@@ -37,4 +40,4 @@ jobs: ...@@ -37,4 +40,4 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Tests - 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 ...
...@@ -72,6 +72,7 @@ time docker run \ ...@@ -72,6 +72,7 @@ time docker run \
--workdir="/src" \ --workdir="/src" \
--rm \ --rm \
--env="CC=/usr/local/bin/gcc" \ --env="CC=/usr/local/bin/gcc" \
--env="BAZEL_CXXOPTS=-std=c++14" \
${LINUX_GCC_FLOOR_CONTAINER} \ ${LINUX_GCC_FLOOR_CONTAINER} \
/usr/local/bin/bazel test ... \ /usr/local/bin/bazel test ... \
--copt="-Wall" \ --copt="-Wall" \
......
...@@ -66,6 +66,7 @@ for absl in 0 1; do ...@@ -66,6 +66,7 @@ for absl in 0 1; do
${BAZEL_BIN} test ... \ ${BAZEL_BIN} test ... \
--copt="-Wall" \ --copt="-Wall" \
--copt="-Werror" \ --copt="-Werror" \
--cxxopt="-std=c++14" \
--define="absl=${absl}" \ --define="absl=${absl}" \
--features=external_include_paths \ --features=external_include_paths \
--keep_going \ --keep_going \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment