Skip to content

Commit dedff68

Browse files
authored
dataconnect.yaml: improve readability of the output of the "tool versions" step (#6669)
1 parent 6a8301b commit dedff68

File tree

2 files changed

+29
-19
lines changed

2 files changed

+29
-19
lines changed

.github/workflows/dataconnect.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,21 @@ jobs:
8484
- name: tool versions
8585
continue-on-error: true
8686
run: |
87-
set +e -v
88-
uname -a
89-
which java
90-
java -version
91-
which javac
92-
javac -version
93-
which node
94-
node --version
95-
${{ env.FDC_FIREBASE_COMMAND }} --version
96-
./gradlew --version
87+
function run_cmd {
88+
echo "==============================================================================="
89+
echo "Running Command: $*"
90+
("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
91+
}
92+
93+
run_cmd uname -a
94+
run_cmd which java
95+
run_cmd java -version
96+
run_cmd which javac
97+
run_cmd javac -version
98+
run_cmd which node
99+
run_cmd node --version
100+
run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
101+
run_cmd ./gradlew --version
97102
98103
- name: Gradle assembleDebugAndroidTest
99104
run: |

.github/workflows/dataconnect_demo_app.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,20 @@ jobs:
8989
- name: tool versions
9090
continue-on-error: true
9191
run: |
92-
set +e -v
93-
which java
94-
java -version
95-
which javac
96-
javac -version
97-
which node
98-
node --version
99-
${{ env.FDC_FIREBASE_COMMAND }} --version
100-
./gradlew --version
92+
function run_cmd {
93+
echo "==============================================================================="
94+
echo "Running Command: $*"
95+
("$@" 2>&1) || echo "WARNING: command failed with non-zero exit code $?: $*"
96+
}
97+
98+
run_cmd which java
99+
run_cmd java -version
100+
run_cmd which javac
101+
run_cmd javac -version
102+
run_cmd which node
103+
run_cmd node --version
104+
run_cmd ${{ env.FDC_FIREBASE_COMMAND }} --version
105+
run_cmd ./gradlew --version
101106
102107
- name: ./gradlew assemble test
103108
run: |

0 commit comments

Comments
 (0)