build/bin/write-dockerfile.sh, .github/workflows/scan-logs.sh: Use mo…

…re GH Actions output groups
mkoeppe · Sep 28, 2023 · ee55b52 · ee55b52
1 parent e5c8f21
commit ee55b52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/scan-logs.sh b/.github/workflows/scan-logs.sh
@@ -5,9 +5,13 @@ LOGS=${1-logs}
 for a in $(find "$LOGS" -type f -name "*.log"); do
     if tail -100 "$a" 2>/dev/null | grep "^[A-Za-z]*Error" >/dev/null; then
         echo :":"error file=$a:":" ==== ERROR IN LOG FILE $a ====
+        echo "::group::$a"
         cat "$a"
+        echo "::endgroup::"
     elif tail -20 "$a" 2>/dev/null | grep -E "^(Warning: Error testing|^sage .*doctest.*failed)" >/dev/null; then
         echo :":"warning file=$a:":" ==== TESTSUITE FAILURE IN LOG FILE $a ====
+        echo "::group::$a"
         cat "$a"
+        echo "::endgroup::"
     fi
 done
diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
@@ -230,11 +230,11 @@ ARG EXTRA_CONFIGURE_ARGS=""
 EOF
 if [ ${WITH_SYSTEM_SPKG} = "force" ]; then
     cat <<EOF
-$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "********** configuring without forcing ***********"; cat config.log; ./configure --enable-build-as-root; cat config.log; exit 1) $ENDRUN
+$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "********** configuring without forcing ***********"; echo "::group::config.log"; cat config.log; echo "::endgroup::"; ./configure --enable-build-as-root; echo "::group::config.log"; cat config.log; echo "::endgroup::"; exit 1) $ENDRUN
 EOF
 else
     cat <<EOF
-$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (cat config.log; exit 1) $ENDRUN
+$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "::group::config.log"; cat config.log; echo "::endgroup::"; exit 1) $ENDRUN
 EOF
 fi
 cat <<EOF