From e162627e7aa0c2e109d0ee9a178155bdfd258d7c Mon Sep 17 00:00:00 2001
From: Adam Babik <a.babik@designfortress.com>
Date: Mon, 24 Jul 2023 21:29:57 +0200
Subject: [PATCH] bazel: fix .bazelrc location in ci.yml

---
 .bazelrc                 |  2 +-
 .github/workflows/ci.yml | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 18fd98cd5a3..8c78416e9b9 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -1,3 +1,3 @@
 build --cxxopt=-std=c++14
 build --host_cxxopt=-std=c++14
-build --test_output errors
+build --test_output=errors
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 92a91023b2b..888ce642990 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,14 +70,11 @@ jobs:
           key: v1-bazel-cache-${{ hashFiles('repositories.bzl') }}
           restore-keys: v1-bazel-cache-
       - name: Configure bazel
-        run: |
-          cat > .bazelrc << EOF
-          startup --output_base /home/vscode/.cache/_grpc_gateway_bazel
-          build --test_output errors
+        run:
+          | # put .bazelrc in $HOME so that it's read before project's .bazelrc
+          cat > /home/vscode/.bazelrc << EOF
+          startup --output_base=/home/vscode/.cache/_grpc_gateway_bazel
           build --@io_bazel_rules_go//go/config:race
-          # Protobuf v3.22.0+ requires C++14
-          build --cxxopt=-std=c++14
-          build --host_cxxopt=-std=c++14
           # Workaround https://github.com/bazelbuild/bazel/issues/3645
           # See https://docs.bazel.build/versions/0.23.0/command-line-reference.html
           build --local_ram_resources=7168 # Github runners have 7G of memory