Skip to content

Commit 6c3d558

Browse files
author
Matthias Koeppe
committed
build/bin/write-dockerfile.sh, .github/workflows/scan-logs.sh: Use more GH Actions output groups
1 parent 2356efa commit 6c3d558

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/scan-logs.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ LOGS=${1-logs}
55
for a in $(find "$LOGS" -type f -name "*.log"); do
66
if tail -100 "$a" 2>/dev/null | grep "^[A-Za-z]*Error" >/dev/null; then
77
echo :":"error file=$a:":" ==== ERROR IN LOG FILE $a ====
8+
echo "::group::$a"
89
cat "$a"
10+
echo "::endgroup::"
911
elif tail -20 "$a" 2>/dev/null | grep -E "^(Warning: Error testing|^sage .*doctest.*failed)" >/dev/null; then
1012
echo :":"warning file=$a:":" ==== TESTSUITE FAILURE IN LOG FILE $a ====
13+
echo "::group::$a"
1114
cat "$a"
15+
echo "::endgroup::"
1216
fi
1317
done

build/bin/write-dockerfile.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,11 @@ ARG EXTRA_CONFIGURE_ARGS=""
230230
EOF
231231
if [ ${WITH_SYSTEM_SPKG} = "force" ]; then
232232
cat <<EOF
233-
$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
233+
$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
234234
EOF
235235
else
236236
cat <<EOF
237-
$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
237+
$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
238238
EOF
239239
fi
240240
cat <<EOF

0 commit comments

Comments
 (0)