From eac784e52c4c3c46a4a2115874fa3c76cb41e673 Mon Sep 17 00:00:00 2001 From: Phoebe Goldman Date: Thu, 3 Jun 2021 10:38:37 -0400 Subject: [PATCH 1/2] rewrite docs makefile for less spurious error-looking output I got pissed off that the text "failed. See log in .log" appeared in successful doc makefile executions, so I made that no longer the case. Now, failure messages print when a command fails, but will not appear at all in the output of a successful run. Also, processes' error output was not being redirected to logfiles, because the `2>&1` was before the `> logfile` and shell redirects are stupid. Now both stdout and stderr of subprocesses are redirected to logfiles. --- doc/Makefile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 06328a95..de38817d 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -12,20 +12,27 @@ intermediate = asdf.cps asdf.log asdf.vr asdf.aux asdf.fn asdf.toc asdf.vrs \ all: asdf.html asdf.info asdf.pdf manual-html +log_output = > $@.log 2>&1 || { echo " failed. See log in $@.log" ; exit 1 ;} + manual-html: asdf.texinfo - makeinfo --html asdf.texinfo \ - 2>&1 > manual-html.log || { echo "failed. See log in manual-html.log" ; exit 1 ;} + @echo "makeinfo --html asdf.texinfo" + @makeinfo --html asdf.texinfo \ + $(log_output) asdf.html: asdf.texinfo - makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo \ - 2>&1 > asdf.html.log || { echo "failed. See log in asdf.html.log" ; exit 1 ;} + @echo "makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo" + @makeinfo --html --no-split --no-headers -o asdf.html asdf.texinfo \ + $(log_output) asdf.info: asdf.texinfo - makeinfo asdf.texinfo + @echo "makeinfo asdf.texinfo" + @makeinfo asdf.texinfo \ + $(log_output) asdf.pdf: asdf.texinfo - texi2pdf asdf.texinfo \ - 2>&1 > asdf.pdf.log || { echo "failed. See log in asdf.pdf.log" ; exit 1 ;} + @echo "texi2pdf asdf.texinfo" + @texi2pdf asdf.texinfo \ + $(log_output) website: all rsync -lt --no-g ${webfiles} ${website} -- GitLab From af987303bd29dca33478556a7b5d3cc20bad0662 Mon Sep 17 00:00:00 2001 From: Eric Timmons Date: Thu, 3 Jun 2021 15:20:45 -0400 Subject: [PATCH 2/2] Always upload job logs --- gitlab-pipelines/new-implementation-version.yml | 2 ++ gitlab-pipelines/standard-pipeline.yml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/gitlab-pipelines/new-implementation-version.yml b/gitlab-pipelines/new-implementation-version.yml index 43330809..2f8c49c5 100644 --- a/gitlab-pipelines/new-implementation-version.yml +++ b/gitlab-pipelines/new-implementation-version.yml @@ -17,6 +17,7 @@ Regression test: - make - make test artifacts: + when: always paths: - build/results/$l-test.text needs: [] @@ -34,6 +35,7 @@ REQUIRE Upgrade test: - make - make test-upgrade artifacts: + when: always paths: - build/results/$l-upgrade.text needs: [] diff --git a/gitlab-pipelines/standard-pipeline.yml b/gitlab-pipelines/standard-pipeline.yml index 649a20a0..c3d887ed 100644 --- a/gitlab-pipelines/standard-pipeline.yml +++ b/gitlab-pipelines/standard-pipeline.yml @@ -31,6 +31,7 @@ Build ASDF: script: - make artifacts: + when: always paths: - build/asdf.lisp @@ -42,10 +43,12 @@ Build docs: - apt-get install -y --no-install-recommends texinfo texlive - make -C doc artifacts: + when: always paths: - doc/asdf.html - doc/asdf.info - doc/asdf.pdf + - doc/*.log ############################################################################### # Regression tests @@ -60,6 +63,7 @@ Build docs: - make - make test artifacts: + when: always paths: - build/results/$l-test.text needs: [] @@ -98,6 +102,7 @@ Regression test expected failure: - make - make test-upgrade artifacts: + when: always paths: - build/results/$l-upgrade.text needs: [] -- GitLab