From 8d5f6a41779b285887346049803d8b2ede0a14d9 Mon Sep 17 00:00:00 2001 From: Nic Volanschi Date: Thu, 23 Jan 2025 17:47:05 +0100 Subject: [PATCH] doc: move octezdoc.sh from doc_publish to normal doc build --- .gitlab/ci/pipelines/before_merging.yml | 1 + .gitlab/ci/pipelines/master_branch.yml | 1 + .gitlab/ci/pipelines/merge_train.yml | 1 + .gitlab/ci/pipelines/schedule_extended_test.yml | 1 + ci/bin/common.ml | 2 +- scripts/ci/doc_publish.sh | 3 --- 6 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 0294125823f7..8a67a4581247 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -5048,6 +5048,7 @@ documentation:build_all: - . $HOME/.venv/bin/activate script: - make -C docs -j sphinx + - make -C docs -j _build/octezdoc.txt artifacts: expire_in: 1 week paths: diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 9712d0e7a0e2..c0472bc11dfc 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -576,6 +576,7 @@ documentation:build_all: - . $HOME/.venv/bin/activate script: - make -C docs -j sphinx + - make -C docs -j _build/octezdoc.txt artifacts: expire_in: 1 week paths: diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 230ab8f1788d..aaf737882df4 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -5047,6 +5047,7 @@ documentation:build_all: - . $HOME/.venv/bin/activate script: - make -C docs -j sphinx + - make -C docs -j _build/octezdoc.txt artifacts: expire_in: 1 week paths: diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index fdddc38d558a..ed488352a6a9 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -3371,6 +3371,7 @@ documentation:build_all: - . $HOME/.venv/bin/activate script: - make -C docs -j sphinx + - make -C docs -j _build/octezdoc.txt artifacts: expire_in: 1 week paths: diff --git a/ci/bin/common.ml b/ci/bin/common.ml index ba25bb8d7cc6..63f3274451ed 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -1399,7 +1399,7 @@ module Documentation = struct ~expire_in:(Duration (Weeks 1)) (* Path must be terminated with / to expose artifact (gitlab-org/gitlab#/36706) *) ["docs/_build/"]) - ["make -C docs -j sphinx"] + ["make -C docs -j sphinx"; "make -C docs -j _build/octezdoc.txt"] (** Create a [documentation:linkcheck] job. *) let job_linkcheck ~job_manuals ~job_docgen ~job_build_all ?dependencies ?rules diff --git a/scripts/ci/doc_publish.sh b/scripts/ci/doc_publish.sh index ea941c1e2565..73070b4225c3 100755 --- a/scripts/ci/doc_publish.sh +++ b/scripts/ci/doc_publish.sh @@ -6,9 +6,6 @@ set -x cd "${CI_PROJECT_DIR}" || exit 1 if [ "${CI_COMMIT_REF_NAME}" == "master" ]; then - # disable until providing dependencies from CI jobs octezgen and manual: - # make -C docs _build/octezdoc.txt - git clone --depth 5 git@gitlab.com:"${CI_PROJECT_NAMESPACE}"/"${CI_PROJECT_NAMESPACE}".gitlab.io gitlab.io rsync --recursive --links --perms --delete --exclude=.doctrees --exclude={{main,alpha,zero}net,master}/index.html docs/_build/ gitlab.io/public/ cd gitlab.io || exit 2 -- GitLab