Fixup CI command failures. (qmk#20291)

struckmb · Apr 10, 2023 · c374b6c · c374b6c
1 parent 1cb09f7
commit c374b6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci_builds.yml b/.github/workflows/ci_builds.yml
@@ -39,11 +39,13 @@ jobs:
     - name: Run `qmk mass-compile` (keymap ${{ matrix.keymap }})
       run: |
         export NCPUS=$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null)
-        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes
+        qmk mass-compile -t -j $NCPUS -km ${{ matrix.keymap }} -e DUMP_CI_METADATA=yes || touch .failed
         # Generate the step summary markdown
-        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY
+        ./util/ci/generate_failure_markdown.sh > $GITHUB_STEP_SUMMARY || true
         # Truncate to a maximum of 1MB to deal with GitHub workflow limit
-        truncate --size='<960K' $GITHUB_STEP_SUMMARY
+        truncate --size='<960K' $GITHUB_STEP_SUMMARY || true
+        # Exit with failure if the compilation stage failed
+        [ ! -f .failed ] || exit 1
 
     - name: 'Upload artifacts'
       uses: actions/upload-artifact@v3

diff --git a/util/ci/generate_failure_markdown.sh b/util/ci/generate_failure_markdown.sh
@@ -19,3 +19,5 @@ dump_failure_info() {
 for failure_file in $(find "$qmk_firmware_dir/.build" -name 'failed.log.*' | sort); do
     dump_failure_info "$failure_file"
 done
+
+exit 0
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,3 +19,5 @@ dump_failure_info() { @@
     for failure_file in $(find "$qmk_firmware_dir/.build" -name 'failed.log.*' | sort); do
         dump_failure_info "$failure_file"
     done
+    exit 0