CI: Build both userdoc and progdoc in the release

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a36a57b9e2ba2923b9f5e841a02b167fdef811d..3978e953d14a500f1daca4f27a955ac541f22cdf 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -249,6 +249,7 @@ tag-collect:
   artifacts:
     paths:
       - obj/doc/bird-singlepage.html
+      - obj/doc/prog-singlepage.html
       - bird-*.tar.gz
       - pkg/pkgs/*
       - pkg/srcpkgs/*
@@ -1434,11 +1435,13 @@ build-release:
     - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then export BRANCH=mergerequest-$CI_MERGE_REQUEST_IID; else export BRANCH=$CI_COMMIT_BRANCH; fi
     - autoreconf
     - ./configure --with-protocols= --disable-client
-    - make obj/doc/bird-singlepage.html
+    - make obj/doc/bird-singlepage.html obj/doc/prog-singlepage.html
+    - if grep '<pre><code>PARSER FAILED ' obj/doc/bird-singlepage.html obj/doc/prog-singlepage.html; then echo "Documentation build is broken!"; false; fi
     - tools/make-archive
   artifacts:
     paths:
       - obj/doc/bird-singlepage.html
+      - obj/doc/prog-singlepage.html
       - bird-*.tar.gz
     expire_in: 1 day
   rules: !reference [ .build-base-rules ]

diff --git a/gitlab/template.yml.j2 b/gitlab/template.yml.j2
index e2574c449434059099b7a16796af0a1f681ab3fb..aeaf8079d809effd3829fb6695149ffe36c08609 100644 (file)
--- a/gitlab/template.yml.j2
+++ b/gitlab/template.yml.j2
@@ -235,6 +235,7 @@ tag-collect:
   artifacts:
     paths:
       - obj/doc/bird-singlepage.html
+      - obj/doc/prog-singlepage.html
       - bird-*.tar.gz
       - pkg/pkgs/*
       - pkg/srcpkgs/*
@@ -398,11 +399,13 @@ build-release:
     - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then export BRANCH=mergerequest-$CI_MERGE_REQUEST_IID; else export BRANCH=$CI_COMMIT_BRANCH; fi
     - autoreconf
     - ./configure --with-protocols= --disable-client
-    - make obj/doc/bird-singlepage.html
+    - make obj/doc/bird-singlepage.html obj/doc/prog-singlepage.html
+    - if grep '<pre><code>PARSER FAILED ' obj/doc/bird-singlepage.html obj/doc/prog-singlepage.html; then echo "Documentation build is broken!"; false; fi
     - tools/make-archive
   artifacts:
     paths:
       - obj/doc/bird-singlepage.html
+      - obj/doc/prog-singlepage.html
       - bird-*.tar.gz
     expire_in: 1 day
   rules: !reference [ .build-base-rules ]