From 0b73dd44a3257c788f930bbb068ffdcb98679456 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com>
Date: Fri, 28 Apr 2023 08:57:46 -0700
Subject: [PATCH] Add -ex switch to all docker bash commands. (#12601)

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 c5b42be3a5..4a8a8f72e7 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -192,7 +192,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 cc729ed0d5..62580ca97e 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 net6.0 /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/net6.0/publish/Google.Protobuf.Test.dll'
diff --git a/.github/workflows/test_php.yml b/.github/workflows/test_php.yml
index 45bdc5136c..f94e3e7514 100644
--- a/.github/workflows/test_php.yml
+++ b/.github/workflows/test_php.yml
@@ -95,7 +95,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 33906f5e72..45b9a1e0cf 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;