From 188684a31d1ef365c39beba28e3ed5c20aa01833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 11 Mar 2022 10:06:39 +0100 Subject: [PATCH 1/3] Always check if docs can be built from tarball The docs:tarball job is deemed to be cheap enough to run all the time and it catches omissions in dist targets of Makefiles. MR !5254 was missing changes to dist target in Makefile and broke docs build from tarball without us noticing during pipeline run on the MR, and it manifested itself only on scheduled pipelines which include docs:tarball job. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a2f00072e..bc3dd52b84 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -529,7 +529,7 @@ docs: artifacts: true docs:tarball: - <<: *schedules_tags_web_triggering_rules + <<: *default_triggering_rules <<: *base_image <<: *docs_job before_script: From b0f6fc7f2fbe76f7a496054344eb47c06237851e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 11 Mar 2022 10:09:57 +0100 Subject: [PATCH 2/3] Shorten artifact retention for docs:tarball job to one day We now run both docs and docs:tarball jobs at the same time and keeping artifacts for longer period of time is a waste. Artifacts for docs job has to be kept for long period of time because they are used by scripts behind bind.isc.org web site. --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc3dd52b84..727b2394a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -394,9 +394,6 @@ stages: - make -j${BUILD_PARALLEL_JOBS:-1} -k doc V=1 - qpdf --check doc/arm/_build/latex/Bv9ARM.pdf - find doc/man/ -maxdepth 1 -name "*.[0-9]" -exec mandoc -T lint "{}" \; | ( ! grep -v -e "skipping paragraph macro. sp after" -e "unknown font, skipping request. ft C" ) - artifacts: - untracked: true - expire_in: "1 month" ### Job Definitions @@ -517,6 +514,7 @@ tarball-create: artifacts: true # Jobs for doc builds on Debian 11 "bullseye" (amd64) +# Long "docs" job artifact retention is needed for bind.isc.org web site docs: <<: *release_branch_triggering_rules @@ -527,6 +525,9 @@ docs: needs: - job: autoreconf artifacts: true + artifacts: + untracked: true + expire_in: "1 month" docs:tarball: <<: *default_triggering_rules From 524fce77fe747e922876eb20f3e5fe1e22248489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Fri, 11 Mar 2022 10:16:47 +0100 Subject: [PATCH 3/3] Fix docs build from tarball broken by MR !5254 Related: !5254 --- doc/man/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index e8f8022099..c1d2528102 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -38,6 +38,8 @@ MANPAGES_RST = \ tsig-keygen.rst \ ../../bin/check/named-checkconf.rst \ ../../bin/check/named-checkzone.rst \ + ../../bin/check/named-compilezone.rst \ + ../../bin/confgen/ddns-confgen.rst \ ../../bin/confgen/rndc-confgen.rst \ ../../bin/confgen/tsig-keygen.rst \ ../../bin/delv/delv.rst \