From a9be71b49645b728d7653b548541c83f3b7e2efe Mon Sep 17 00:00:00 2001 From: Jens Reidel Date: Tue, 4 Nov 2025 00:34:09 +0100 Subject: [PATCH] ci: Build docs with Sphinx Signed-off-by: Jens Reidel Part-of: --- .ci/build-docs.sh | 11 ++++------- .gitignore | 3 +-- .gitlab-ci.yml | 6 +++--- antora-test.yml | 16 ---------------- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 antora-test.yml diff --git a/.ci/build-docs.sh b/.ci/build-docs.sh index 97e5e5bb8..66ae1c314 100755 --- a/.ci/build-docs.sh +++ b/.ci/build-docs.sh @@ -10,13 +10,10 @@ # Install dependencies if [ "$(id -u)" = 0 ]; then set -x - apk -q add git nodejs npm + apk -q add py3-pip make git exec su "${TESTUSER:-build}" -c "sh -e $0" fi -npm install antora -npx antora -v - -# FIXME: https://gitlab.com/antora/antora/-/issues/1183 -git clone --depth 1 https://gitlab.postmarketos.org/postmarketOS/handbook -npx antora --clean antora-test.yml +cd docs/ +make venv +make diff --git a/.gitignore b/.gitignore index a626fcf16..4ef1c9227 100644 --- a/.gitignore +++ b/.gitignore @@ -66,8 +66,7 @@ instance/ .scrapy # Documentation -docs/_build/ -build/site +public # PyBuilder target/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f64c25d1..158ca5725 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,17 +208,17 @@ build-docs: rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: - - docs/**/* + - docs/** deploy-docs: stage: deploy trigger: - project: postmarketOS/handbook + project: postmarketOS/docs.postmarketos.org strategy: depend rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "postmarketOS" changes: - - docs/**/* + - docs/** auto-update: stage: autoupdate diff --git a/antora-test.yml b/antora-test.yml deleted file mode 100644 index e597789f5..000000000 --- a/antora-test.yml +++ /dev/null @@ -1,16 +0,0 @@ -site: - title: Device ports - start_page: pmaports::index.adoc - -content: - sources: - - url: . - start_path: docs - branches: HEAD - - url: https://gitlab.postmarketos.org/postmarketOS/handbook - branches: HEAD - -ui: - bundle: - url: https://gitlab.postmarketos.org/postmarketOS/antora-ui-default/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable - snapshot: true