From a995c5b21f48339484b5dfdcc2044d04da5cf1f4 Mon Sep 17 00:00:00 2001 From: Jake Awe <50372925+AyodeAwe@users.noreply.github.com> Date: Wed, 7 Jun 2023 17:55:13 -0500 Subject: [PATCH] use rapids-upload-docs script (#1578) This PR updates the `build_docs.sh` script to use the new consolidatory `rapids-upload-script` [shared script](https://github.com/rapidsai/gha-tools/pull/56). The shared script enables docs uploads to applicable S3 buckets for branch. nightly and PR builds. Authors: - Jake Awe (https://github.com/AyodeAwe) - Corey J. Nolet (https://github.com/cjnolet) - AJ Schmidt (https://github.com/ajschmidt8) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) URL: https://github.com/rapidsai/raft/pull/1578 --- ci/build_docs.sh | 17 ++++++++--------- ci/release/update-version.sh | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 16999eb2e5..4f99348c95 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -19,7 +19,6 @@ rapids-print-env rapids-logger "Downloading artifacts from previous jobs" CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp) PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) -VERSION_NUMBER="23.08" rapids-mamba-retry install \ --channel "${CPP_CHANNEL}" \ @@ -29,21 +28,21 @@ rapids-mamba-retry install \ pylibraft \ raft-dask +export RAPIDS_VERSION_NUMBER="23.08" +export RAPIDS_DOCS_DIR="$(mktemp -d)" -rapids-logger "Build Doxygen docs" +rapids-logger "Build CPP docs" pushd cpp/doxygen doxygen Doxyfile popd -rapids-logger "Build Sphinx docs" +rapids-logger "Build Python docs" pushd docs sphinx-build -b dirhtml source _html sphinx-build -b text source _text +mkdir -p "${RAPIDS_DOCS_DIR}/raft/"{html,txt} +mv _html/* "${RAPIDS_DOCS_DIR}/raft/html" +mv _text/* "${RAPIDS_DOCS_DIR}/raft/txt" popd - -if [[ ${RAPIDS_BUILD_TYPE} != "pull-request" ]]; then - rapids-logger "Upload Docs to S3" - aws s3 sync --no-progress --delete docs/_html "s3://rapidsai-docs/raft/${VERSION_NUMBER}/html" - aws s3 sync --no-progress --delete docs/_text "s3://rapidsai-docs/raft/${VERSION_NUMBER}/txt" -fi +rapids-upload-docs diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index a0e604ffcf..ef935ba518 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -84,7 +84,7 @@ done for FILE in .github/workflows/*.yaml; do sed_runner "/shared-action-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" done -sed_runner "s/VERSION_NUMBER=\".*/VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh +sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh sed_runner "/^PROJECT_NUMBER/ s|\".*\"|\"${NEXT_SHORT_TAG}\"|g" cpp/doxygen/Doxyfile