more statuses

Author: doomwastaken

.github/actions/unit-test/action.yml

@@ -8,30 +8,37 @@ inputs:
 
 outputs:
   timed_out:
-    value: ${{ steps.check_timeout.outputs.timed_out }}
+    value: ${{ steps.set_flag.outputs.timed_out }}
 
 runs:
   using: "composite"
   steps:
+    - name: Set default timeout flag
+      id: set_flag
+      shell: bash
+      run: echo "timed_out=false" >> $GITHUB_OUTPUT
+
     - name: Checkout code
       uses: actions/checkout@v4
       with:
         fetch-depth: 1
         ref: ${{ inputs.pr_ref }}
 
     - name: Flash unit test firmware
-      id: flashing
       shell: bash
       run: |
-        timeout 180 bash -c '
+        timeout 240 bash -c '
           source scripts/toolchain/fbtenv.sh
           ./fbt resources firmware_latest flash LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
         '
-        echo $? > flash_result.txt
+        CODE=$?
+        if [ "$CODE" = "124" ]; then
+          echo "timed_out=true" >> $GITHUB_OUTPUT
+          echo "::error::Flash step timed out"
+          exit 1
+        fi
 
     - name: Prepare and reboot
-      id: copy
-      if: success()
       shell: bash
       run: |
         timeout 120 bash -c '
@@ -42,18 +49,26 @@ runs:
           python3 scripts/power.py reboot
           python3 scripts/testops.py -t=30 await_flipper
         '
-        echo $? > copy_result.txt
+        CODE=$?
+        if [ "$CODE" = "124" ]; then
+          echo "timed_out=true" >> $GITHUB_OUTPUT
+          echo "::error::Copy step timed out"
+          exit 1
+        fi
 
     - name: Run unit tests
-      id: run_units
-      if: success()
       shell: bash
       run: |
         timeout 360 bash -c '
           source scripts/toolchain/fbtenv.sh
           python3 scripts/testops.py run_units
         '
-        echo $? > run_units_result.txt
+        CODE=$?
+        if [ "$CODE" = "124" ]; then
+          echo "timed_out=true" >> $GITHUB_OUTPUT
+          echo "::error::Run step timed out"
+          exit 1
+        fi
 
     - name: Upload unit test results
       if: failure()
@@ -67,15 +82,3 @@ runs:
       shell: bash
       run: |
         ./fbt gdb_trace_all LIB_DEBUG=1 FIRMWARE_APP_SET=unit_tests FORCE=1
-
-    - name: Check for timeout
-      id: check_timeout
-      shell: bash
-      run: |
-        echo "timed_out=false" >> $GITHUB_OUTPUT
-        for file in flash_result.txt copy_result.txt run_units_result.txt; do
-          if [ -f "$file" ] && [ "$(cat $file)" = "124" ]; then
-            echo "timed_out=true" >> $GITHUB_OUTPUT
-            break
-          fi
-        done

.github/actions/updater-test/action.yml

@@ -8,30 +8,38 @@ inputs:
 
 outputs:
   timed_out:
-    value: ${{ steps.set_timeout_flag.outputs.timed_out }}
+    value: ${{ steps.set_flag.outputs.timed_out }}
 
 runs:
   using: "composite"
   steps:
+    - name: Set default timeout flag
+      id: set_flag
+      shell: bash
+      run: echo "timed_out=false" >> $GITHUB_OUTPUT
+
     - name: Checkout code
       uses: actions/checkout@v4
       with:
         fetch-depth: 1
         ref: ${{ inputs.pr_ref }}
 
     - name: Flash full firmware
-      id: flash
       shell: bash
       run: |
         timeout 180 bash -c '
           source scripts/toolchain/fbtenv.sh
           python3 scripts/testops.py -t=180 await_flipper
           ./fbt flash_usb_full FORCE=1
         '
-        echo $? > flash_result.txt
+        CODE=$?
+        if [ "$CODE" = "124" ]; then
+          echo "timed_out=true" >> $GITHUB_OUTPUT
+          echo "::error::Flash step timed out"
+          exit 1
+        fi
 
     - name: Validate updater
-      id: validate
       shell: bash
       run: |
         timeout 180 bash -c '
@@ -40,16 +48,9 @@ runs:
           ./fbt flash_usb FORCE=1
           python3 scripts/testops.py -t=180 await_flipper
         '
-        echo $? > validate_result.txt
-
-    - name: Check for timeout and set output
-      id: set_timeout_flag
-      shell: bash
-      run: |
-        echo "timed_out=false" >> $GITHUB_OUTPUT
-
-        if [ -f flash_result.txt ] && [ "$(cat flash_result.txt)" = "124" ]; then
-          echo "timed_out=true" >> $GITHUB_OUTPUT
-        elif [ -f validate_result.txt ] && [ "$(cat validate_result.txt)" = "124" ]; then
+        CODE=$?
+        if [ "$CODE" = "124" ]; then
           echo "timed_out=true" >> $GITHUB_OUTPUT
+          echo "::error::Validate step timed out"
+          exit 1
         fi