CI: show build commands on terminal (#1965)

test-builds.sh records build output in per-layer logs, and we are
already collecting those logs. Send build output to standard output as
well, to expose it in GitHub Actions user interface. This new detailed
output is enclosed in a "layer ... output" group to keep emphasizing
problematic output lines extracted by test-builds.sh.

Also enclose MacOS build setup output in a group, for similar reasons.

diff --git a/.github/workflows/quick.yaml b/.github/workflows/quick.yaml
index 2383244752a1795d91220eadc48c79ec00ad011b..1229b8ac027582810f16a550681728245f0de143 100644 (file)
--- a/.github/workflows/quick.yaml
+++ b/.github/workflows/quick.yaml
@@ -148,7 +148,7 @@ jobs:
           key: ${{ matrix.os }}-${{ matrix.compiler.CC }}-${{ matrix.layer.nick }}
 
       - name: Run build on Linux
-        run: ./test-builds.sh ${{ matrix.layer.name }}
+        run: ./test-builds.sh --verbose ${{ matrix.layer.name }}
 
       - name: Publish build logs
         if: success() || failure()
@@ -181,7 +181,7 @@ jobs:
         uses: github/codeql-action/init@v3
 
       - name: Build Squid
-        run: ./test-builds.sh ./test-suite/buildtests/layer-02-maximus.opts
+        run: ./test-builds.sh --verbose ./test-suite/buildtests/layer-02-maximus.opts
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3

diff --git a/.github/workflows/slow.yaml b/.github/workflows/slow.yaml
index 4b723140504512926f30375773c3abd566ca90d5..20334bdc9ed30b91c0497b0eac865e96f9c2a18f 100644 (file)
--- a/.github/workflows/slow.yaml
+++ b/.github/workflows/slow.yaml
@@ -72,8 +72,7 @@ jobs:
 
       - name: Run test-builds
         id: test-builds
-        run: |
-          ./test-builds.sh ${{ matrix.layer.name }}
+        run: ./test-builds.sh --verbose ${{ matrix.layer.name }}
 
       - name: Publish build logs
         if: success() || failure()
@@ -101,6 +100,7 @@ jobs:
       - name: Run test-builds
         id: test-builds
         run: |
+          echo "::group::setup output"
           eval `brew shellenv`
           PKG_CONFIG_PATH="$HOMEBREW_PREFIX/lib/pkgconfig"
           PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$HOMEBREW_PREFIX/opt/openldap/lib/pkgconfig"
@@ -128,8 +128,9 @@ jobs:
           editable=$HOMEBREW_CELLAR/libtool/2.4.7/bin/glibtoolize
           sed -i.bak 's@ltdl_ac_aux_dir=""@ltdl_ac_aux_dir="../build-aux"@' $editable || true
           diff -u $editable.bak $editable || true
+          echo "::endgroup::"
 
-          ./test-builds.sh
+          ./test-builds.sh --verbose
 
       - name: Publish build logs
         if: success() || failure()
@@ -176,7 +177,7 @@ jobs:
 
           run: |
             export MAKE=gmake
-            ./test-builds.sh
+            ./test-builds.sh --verbose
 
       - name: Publish build logs
         if: success() || failure()

diff --git a/test-builds.sh b/test-builds.sh
index 7f27977cb31391d54ffdf4d973ee3322b2fa900d..2e42652dc81e1c9931e4e00bd8129e10f32e2ae9 100755 (executable)
--- a/test-builds.sh
+++ b/test-builds.sh
@@ -68,9 +68,12 @@ while [ $# -ge 1 ]; do
 done
 
 logtee() {
+    local layer=$2
     case $verbose in
     yes)
+        echo "::group::$layer output" # github collapsible section
         tee $1
+        echo "::endgroup::"
         ;;
     progress)
         tee $1 | awk '{printf "."; n++; if (!(n % 80)) print "" } END {print ""}'
@@ -111,7 +114,7 @@ buildtest() {
 
        # log the result for the outer script to notice
        echo "buildtest.sh result is $result";
-    } 2>&1 | logtee ${log}
+    } 2>&1 | logtee ${log} ${layer}
 
     result=1 # failure by default
     if grep -q '^buildtest.sh result is 0$' ${log}; then