From 6e750e6aab62a15f447dfd1a591a84d574a20dff Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Tue, 4 Feb 2025 19:47:04 +0000 Subject: [PATCH 1/4] dataconnect.yaml: improve readability of the output of the "tool versions" step --- .github/workflows/dataconnect.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml index 1049d031209..c4ee89c3500 100644 --- a/.github/workflows/dataconnect.yml +++ b/.github/workflows/dataconnect.yml @@ -84,16 +84,22 @@ jobs: - name: tool versions continue-on-error: true run: | - set +e -v - uname -a - which java - java -version - which javac - javac -version - which node - node --version - ${{ env.FDC_FIREBASE_COMMAND }} --version - ./gradlew --version + function run_cmd { + echo "===============================================================================" + echo "Running Command: $*" + ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*" + echo + } + + run_cmd uname -a + run_cmd which java + run_cmd java -version + run_cmd which javac + run_cmd javac -version + run_cmd which node + run_cmd node --version + run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version + run_cmd ./gradlew --version - name: Gradle assembleDebugAndroidTest run: | From e9dcb57c3f5b5afea6f883b5744983003f9ca350 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Tue, 4 Feb 2025 19:47:04 +0000 Subject: [PATCH 2/4] dataconnect.yaml: improve readability of the output of the "tool versions" step --- .github/workflows/dataconnect.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/dataconnect.yml b/.github/workflows/dataconnect.yml index c4ee89c3500..2f2cc8613a0 100644 --- a/.github/workflows/dataconnect.yml +++ b/.github/workflows/dataconnect.yml @@ -88,7 +88,6 @@ jobs: echo "===============================================================================" echo "Running Command: $*" ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*" - echo } run_cmd uname -a From 51a2f74eed76ed075eb651a0e5b3311aabe8fce0 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Tue, 4 Feb 2025 20:44:20 +0000 Subject: [PATCH 3/4] dataconnect_demo_app.yml: make the same change to this file --- .github/workflows/dataconnect_demo_app.yml | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dataconnect_demo_app.yml b/.github/workflows/dataconnect_demo_app.yml index 7ce51814b4d..c401f296b71 100644 --- a/.github/workflows/dataconnect_demo_app.yml +++ b/.github/workflows/dataconnect_demo_app.yml @@ -89,15 +89,20 @@ jobs: - name: tool versions continue-on-error: true run: | - set +e -v - which java - java -version - which javac - javac -version - which node - node --version - ${{ env.FDC_FIREBASE_COMMAND }} --version - ./gradlew --version + function run_cmd { + echo "===============================================================================" + echo "Running Command: $*" + ("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*" + } + + run_cmd which java + run_cmd java -version + run_cmd which javac + run_cmd javac -version + run_cmd which node + run_cmd node --version + run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version + run_cmd ./gradlew --version - name: ./gradlew assemble test run: | From 8ab623c0e082f7e4e04e2dd8d6e228f29fb0550b Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Wed, 5 Feb 2025 07:14:03 +0000 Subject: [PATCH 4/4] empty commit to force github actions