From 238d2507a866547a028772939fb6574dcff182ca Mon Sep 17 00:00:00 2001
From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com>
Date: Thu, 27 Apr 2023 17:23:48 -0700
Subject: [PATCH] Add -ex switch to all docker bash commands. (#12602)

Without this, certain failures will be silently ignored.

PiperOrigin-RevId: 527718574
---
 .github/workflows/test_cpp.yml    | 2 +-
 .github/workflows/test_csharp.yml | 4 ++--
 .github/workflows/test_php.yml    | 2 +-
 .github/workflows/test_ruby.yml   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index 238d0a7193cca..081503322a032 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -185,7 +185,7 @@ jobs:
           platform: linux/386
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: >-
-              /bin/bash -c '
+              /bin/bash -cex '
               cd /workspace;
               ccache -z;
               cmake . -DCMAKE_CXX_STANDARD=14 ${{ env.CCACHE_CMAKE_FLAGS }};
diff --git a/.github/workflows/test_csharp.yml b/.github/workflows/test_csharp.yml
index 1fe79d464145f..4d5770a9cc1ec 100644
--- a/.github/workflows/test_csharp.yml
+++ b/.github/workflows/test_csharp.yml
@@ -62,7 +62,7 @@ jobs:
           image: mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: >-
-            /bin/bash -c '
+            /bin/bash -cex '
             DOTNET_CLI_TELEMETRY_OPTOUT=true
             DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
             dotnet publish -c Release -f net60 /workspace/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj'
@@ -80,7 +80,7 @@ jobs:
           skip-staleness-check: true
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: >-
-            /bin/bash -c '
+            /bin/bash -cex '
             DOTNET_CLI_TELEMETRY_OPTOUT=true
             DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
             dotnet vstest /workspace/csharp/src/Google.Protobuf.Test/bin/Release/net60/publish/Google.Protobuf.Test.dll'
diff --git a/.github/workflows/test_php.yml b/.github/workflows/test_php.yml
index fda266fb2aa81..756aeb6fda777 100644
--- a/.github/workflows/test_php.yml
+++ b/.github/workflows/test_php.yml
@@ -92,7 +92,7 @@ jobs:
           platform: linux/386
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: >-
-            /bin/bash -c '
+            /bin/bash -cex '
             cd php && php -v && php -m;
             composer update --ignore-platform-reqs;
             PROTOC=/workspace/${{ steps.cross-compile.outputs.protoc }}
diff --git a/.github/workflows/test_ruby.yml b/.github/workflows/test_ruby.yml
index 31b8f79b9f834..d7a460f556a29 100644
--- a/.github/workflows/test_ruby.yml
+++ b/.github/workflows/test_ruby.yml
@@ -63,7 +63,7 @@ jobs:
           skip-staleness-check: true
           credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
           command: >-
-            /bin/bash -c '
+            /bin/bash -cex '
             gem install bundler;
             cd /workspace/ruby;
             bundle;