Do not display config.log when configure failed

kwankyu · Mar 6, 2025 · 1293cfd · 1293cfd
1 parent 527a5ae
commit 1293cfd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.ci/write-dockerfile.sh b/.ci/write-dockerfile.sh
@@ -318,11 +318,11 @@ ARG CONFIGURE_ARGS="${CONFIGURE_ARGS:---enable-build-as-root}"
 EOF
 if [ ${WITH_SYSTEM_SPKG} = "force" ]; then
     cat <<EOF
-$RUN ./configure $SYSTEM_CONFIGURE_ARGS \${CONFIGURE_ARGS} || (echo "::group::config.log"; cat config.log; echo "::endgroup::"; echo "********** configuring without forcing ***********"; ./configure \${CONFIGURE_ARGS}; echo "::group::config.log"; cat config.log; echo "::endgroup::"; exit 1)$ENDRUN$THEN_SAVE_STATUS
+$RUN ./configure $SYSTEM_CONFIGURE_ARGS \${CONFIGURE_ARGS} || (echo "********** configuring without forcing ***********"; ./configure \${CONFIGURE_ARGS}; exit 1)$ENDRUN$THEN_SAVE_STATUS
 EOF
 else
     cat <<EOF
-$RUN ./configure $SYSTEM_CONFIGURE_ARGS \${CONFIGURE_ARGS} || (echo "::group::config.log"; cat config.log; echo "::endgroup::"; exit 1)$ENDRUN$THEN_SAVE_STATUS
+$RUN ./configure $SYSTEM_CONFIGURE_ARGS \${CONFIGURE_ARGS}$ENDRUN$THEN_SAVE_STATUS
 EOF
 fi
 cat <<EOF

diff --git a/tox.ini b/tox.ini
@@ -800,7 +800,7 @@ commands =
     docker:              rm -f {envdir}/sage/STATUS; \
     docker:              docker run $BUILD_IMAGE:$BUILD_TAG bash -c " \
     docker:                  tar -c --ignore-failed-read -f - \
-    docker:                    /sage/STATUS /sage/logs /sage/{prefix,venv}/var/lib/sage/installed \
+    docker:                    /sage/STATUS /sage/config.log /sage/logs /sage/{prefix,venv}/var/lib/sage/installed \
     docker:                    ~/.sage/timings2.json /sage/pkgs/*/.tox/*/.sage/timings2.json \
     docker:                    /sage/pkgs/*/.tox/*/logs 2> /dev/null" \
     docker:                | (cd {envdir} && tar xf -); \