Log collection fixes

Author: jglogan

.github/workflows/common.yml

@@ -69,6 +69,7 @@ jobs:
           mv bin/${{ env.BUILD_CONFIGURATION }}/bundle/container-dSYM.zip outputs
 
       - name: Test the container project
+        timeout-minutes: 5
         run: |
           APP_ROOT=$(mktemp -d -p "${RUNNER_TEMP}")
           LOG_ROOT="${APP_ROOT}/logs"
@@ -81,23 +82,19 @@ jobs:
           echo no_proxy=${no_proxy}
           echo "APP_ROOT=${APP_ROOT}" >> $GITHUB_ENV
           echo "LOG_ROOT=${LOG_ROOT}" >> $GITHUB_ENV
-          make APP_ROOT="${APP_ROOT}" LOG_ROOT="${LOG_ROOT}" test install-kernel integration
+          make APP_ROOT="${APP_ROOT}" LOG_ROOT="${LOG_ROOT}" test install-kernel integration || status=$?
+          if [ "${status:-0}" -ne "0" ] ; then
+            echo "Tests failed with status: ${status}"
+            if [ -d "${LOG_ROOT}" ] ; then
+              echo "Collecting logs from ${LOG_ROOT}..."
+              tar czf container-logs.tar.gz -C "$(dirname "${LOG_ROOT}")" "$(basename "${LOG_ROOT}")"
+              echo "Log archive created: container-logs.tar.gz"
+            fi
+            exit ${status}
+          fi
         env:
           DEVELOPER_DIR: "/Applications/Xcode-latest.app/Contents/Developer"
 
-      - name: Collect logs
-        if: always()
-        run: |
-          echo ${LOG_ROOT}
-          ls -l ${LOG_ROOT} || true
-          if [ -n "${LOG_ROOT}" ] && [ -d "${LOG_ROOT}" ] ; then
-            echo "Collecting logs from ${LOG_ROOT}..."
-            tar czf container-logs.tar.gz -C "$(dirname "${LOG_ROOT}")" "$(basename "${LOG_ROOT}")"
-            echo "Log archive created: container-logs.tar.gz"
-          else
-            echo "No logs to collect (LOG_ROOT not set or directory does not exist)"
-          fi
-
       - name: Upload logs if present
         if: always()
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6