Remove empty step, minor polish

youtube · Sep 19, 2024 · 37ef744 · 37ef744
1 parent 52770f7
commit 37ef744
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/.github/actions/on_device_tests/action.yaml b/.github/actions/on_device_tests/action.yaml
@@ -112,7 +112,7 @@ runs:
           gsutil cp "${GCS_RESULTS_PATH}/${COBALT_XMLS_FILENAME}" . || true
 
           # Break if the files were downloaded.
-          if [[ -f "${COBALT_ERROR_LOG}" && -f "${COBALT_XMLS_FILENAME}" ]]; then
+          if [[ -f "${COBALT_XMLS_FILENAME}" && -f "${COBALT_ERROR_LOG}" && && -f "${COBALT_INFO_LOG}" ]]; then
             break
           fi
 
@@ -122,23 +122,20 @@ runs:
         cat ${COBALT_ERROR_LOG}
 
         # Prepare unit test results for DataDog upload.
-        mkdir -p ${UNIT_TEST_RESULT_PATH}/${{ matrix.platform }}/${{ matrix.shard }}/
+        RESULT_PATH=${UNIT_TEST_RESULT_PATH}/${{ matrix.platform }}/${{ matrix.shard }}/
+        mkdir -p ${RESULT_PATH}
 
+        # Set tags for test differentiation.
         tags="platform:${{ matrix.platform }}"
         echo $tags > ${UNIT_TEST_RESULT_PATH}/${{ matrix.platform }}/TAGS
 
-        unzip ${COBALT_XMLS_FILENAME} -d ${UNIT_TEST_RESULT_PATH}/${{ matrix.platform }}/${{ matrix.shard }}/
+        unzip ${COBALT_XMLS_FILENAME} -d ${RESULT_PATH}
 
         # Forward environment variables for uploading artifacts.
         echo "UNIT_TEST_RESULT_PATH=${UNIT_TEST_RESULT_PATH}" >> $GITHUB_ENV
         echo "COBALT_ERROR_LOG=${COBALT_ERROR_LOG}" >> $GITHUB_ENV
         echo "COBALT_INFO_LOG=${COBALT_INFO_LOG}" >> $GITHUB_ENV
       shell: bash
-    - name: Populate TAGS for unit test report
-      if: always() && env.TEST_TYPE == 'unit_test'
-      shell: bash
-      run: |
-        # Set tags for test differentiation.
     - name: Archive Unit Test Logs
       uses: actions/upload-artifact@v3
       if: always() && env.TEST_TYPE == 'unit_test'