Skip to content

Commit 4d76d3a

Browse files
committed
Fix nightly test result reporting.
1 parent 347388f commit 4d76d3a

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/nightly.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
# Run the native libraries first so that the native, Hybrid and React MobileSync tests
1010
# don't run simultaniously (to prevents flappers).
1111
jobs:
12-
android-nightly-core:
12+
android-nightly:
1313
strategy:
1414
fail-fast: false
1515
matrix:
@@ -20,7 +20,7 @@ jobs:
2020
secrets: inherit
2121
android-nightly-Hybrid:
2222
if: success() || failure()
23-
needs: [android-nightly-core]
23+
needs: [android-nightly]
2424
strategy:
2525
fail-fast: false
2626
matrix:

.github/workflows/reusable-workflow.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,13 @@ jobs:
168168
169169
gsutil ls ${BUCKET_PATH} > /dev/null 2>&1
170170
if [ $? == 0 ] ; then
171-
# Copy merged XML file from top level for test reporting
172-
gsutil cp "${BUCKET_PATH}/*test_results_merged.xml" firebase_results/api_${LEVEL}_test_result.xml
171+
# Copy XML file for test reporting
172+
if gsutil ls "${BUCKET_PATH}/*test_results_merged.xml" > /dev/null 2>&1; then
173+
# Sharded runs produce test_results_merged.xml at top level
174+
gsutil cp "${BUCKET_PATH}/*test_results_merged.xml" firebase_results/api_${LEVEL}_test_result.xml
175+
else
176+
gsutil cp "${BUCKET_PATH}/*/test_result_1.xml" firebase_results/api_${LEVEL}_test_result.xml
177+
fi
173178
174179
# Copy all shard data for code coverage (only needed for one level)
175180
if [ "$LEVEL" == "$PR_API_VERSION" ] ; then

0 commit comments

Comments
 (0)