diff --git a/doc/Makefile b/doc/Makefile index 06328a9508d72407fe96cca2be35f1e2bb3eaaa2..de38817dd04fad4f35f5cf94190b0fc5a38a0e57 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} diff --git a/gitlab-pipelines/new-implementation-version.yml b/gitlab-pipelines/new-implementation-version.yml index 4333080968aafabfad9cc3dfdc5fa2ae6f053b7d..2f8c49c56996d76ab99c538602133c321b0f3553 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 649a20a0cb15f4b50759c28689139be10850f57b..c3d887ed554e0aa316a3f76ff20c3187b80862d8 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: []