From 115e8f59772f1e2afa654d76ba8b3fa67cec1e22 Mon Sep 17 00:00:00 2001
From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
Date: Fri, 12 Mar 2021 21:53:06 +0100
Subject: [PATCH] Meta: Make GA logs less misleading

If the job fails early (e.g. during linting), the 'cat debug.log' step would *also* fail.
This would confuse GA into thinking that this is the crucial thing and highlights it.
This misleads the user into looking at the wrong thing.
---
 .github/workflows/cmake.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 656f455592..c65ab0a2a6 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -143,14 +143,22 @@ jobs:
       env:
         SERENITY_KERNEL_CMDLINE: "boot_mode=self-test"
         SERENITY_RUN: "ci"
-      run: ninja run
+      run: |
+        echo "::group::ninja run # Qemu output"
+        run_worked=y
+        ninja run || run_worked=n
+        echo "::endgroup::"
+        echo "::group::cat debug.log # Serenity output"
+        if [ "y" = "${run_worked}" ] ; then
+          cat debug.log
+        else
+          echo "skipped (qemu had non-zero exit-code)"
+        fi
+        echo "::endgroup::"
+        [ "y" = ${run_worked} ]
       timeout-minutes: 10
       # FIXME: When stable, remove continue on error. (See issue #5541)
       continue-on-error: true
-    - name: Print target logs
-      if: ${{ !cancelled() && matrix.debug-macros == 'NORMAL_DEBUG'}}
-      working-directory: ${{ github.workspace }}/Build
-      run: cat ./debug.log
 
   build_and_test_lagom:
     runs-on: ${{ matrix.os }}