diff --git a/.github/template_gitref b/.github/template_gitref index 9ec4e6fe6..e169228ce 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-326-ge5addc7 +2021.08.26-327-g520b576 diff --git a/.github/workflows/scripts/script.sh b/.github/workflows/scripts/script.sh index a5f10b3c1..f00fa2fcf 100755 --- a/.github/workflows/scripts/script.sh +++ b/.github/workflows/scripts/script.sh @@ -31,6 +31,8 @@ if [[ "$TEST" = "docs" ]]; then if [[ "$GITHUB_WORKFLOW" == "Ansible CI" ]]; then towncrier build --yes --version 4.0.0.ci fi + # Unified Docs Build + pulp-docs build # Legacy Docs Build cd docs make PULP_URL="$PULP_URL" diagrams html @@ -43,6 +45,12 @@ if [[ "$TEST" = "docs" ]]; then exit fi +if [[ "$TEST" = "new_docs" ]]; then + pip install --user git+https://github.com/pulp/pulp-docs + pulp-docs build + exit +fi + REPORTED_STATUS="$(pulp status)" echo "machine pulp diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 01dd7acd9..768d2b1de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,6 +23,7 @@ jobs: env: - TEST: pulp - TEST: docs + - TEST: new_docs - TEST: azure - TEST: s3 - TEST: lowerbounds diff --git a/CHANGES/+new-docs-ci.misc b/CHANGES/+new-docs-ci.misc new file mode 100644 index 000000000..91a157185 --- /dev/null +++ b/CHANGES/+new-docs-ci.misc @@ -0,0 +1 @@ +Added the Unified Docs CI build-check on PRs. diff --git a/doc_requirements.txt b/doc_requirements.txt index bd7622a47..4ca04120b 100644 --- a/doc_requirements.txt +++ b/doc_requirements.txt @@ -15,4 +15,7 @@ sphinxcontrib-jquery sphinxcontrib-openapi mistune<4.0.0 Jinja2<3.2 + +# Unified docs +pulp-docs @ git+https://github.com/pulp/pulp-docs@main # Extra requirements diff --git a/docs/template_gitref b/docs/template_gitref index 9ec4e6fe6..e169228ce 100644 --- a/docs/template_gitref +++ b/docs/template_gitref @@ -1 +1 @@ -2021.08.26-326-ge5addc7 +2021.08.26-327-g520b576 diff --git a/template_config.yml b/template_config.yml index 643c5e5da..2308e7c41 100644 --- a/template_config.yml +++ b/template_config.yml @@ -88,5 +88,5 @@ test_reroute: true test_s3: true use_issue_template: true use_legacy_docs: true -use_unified_docs: false +use_unified_docs: true