From 10ff5d5507fea8e76837aab81dc6932fd6f8a3ea Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Tue, 22 Mar 2022 10:29:21 +0100
Subject: [PATCH] Merge 'Build logs' into 'Build' in
 '.github/workflows/ccpp.yml:jobs.build-and-check'

This avoids the supposed issue that in case that 'make' fails, the whole
'jobs.build-and-check' stops, and 'Build logs' isn't executed, and thus there's
no indication in the GitHub UI why 'make' failed.

Using a shell pipeline is OK; the exit code of 'make' isn't lost, as per
<https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsshell>,
'bash' is being run with '-o pipefail'.
---
 .github/workflows/ccpp.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index e1f6ea8b8a8..7e3f8c71163 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -48,13 +48,11 @@ jobs:
                --enable-multilib
 
     - name: Build
+      shell: bash
       run: |
            cd gccrs-build; \
-           make -j $(nproc) > log 2>&1
+           make -j $(nproc) 2>&1 | tee log
            
-    - name: Build logs
-      run: cat gccrs-build/log
-
     - name: Check for new warnings
       run: |
            grep 'warning:' gccrs-build/log | sort > log_warnings;