From 0646451fa21efec92c05b579d0cbb6941e0eaa6f Mon Sep 17 00:00:00 2001
From: Jake Awe <jawe@nvidia.com>
Date: Tue, 6 Jun 2023 14:29:12 -0500
Subject: [PATCH] use rapids-upload-docs script

---
 ci/build_docs.sh             | 21 +++++++++++----------
 ci/release/update-version.sh |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index 5ce3fad53..c4f318f26 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}" \
@@ -27,21 +26,23 @@ rapids-mamba-retry install \
   libcuspatial \
   cuspatial
 
-rapids-logger "Build Doxygen docs"
+export RAPIDS_VERSION_NUMBER="23.08"
+export RAPIDS_DOCS_DIR="$(mktemp -d)"
+
+rapids-logger "Build CPP docs"
 pushd cpp/doxygen
 doxygen Doxyfile
+mkdir -p "${RAPIDS_DOCS_DIR}/libcuspatial/html"
+mv html/* "${RAPIDS_DOCS_DIR}/libcuspatial/html"
 popd
 
-rapids-logger "Build Sphinx docs"
+rapids-logger "Build Python docs"
 pushd docs
 sphinx-build -b dirhtml source _html -W
 sphinx-build -b text source _text -W
+mkdir -p "${RAPIDS_DOCS_DIR}/cuspatial/"{html,txt}
+mv _html/* "${RAPIDS_DOCS_DIR}/cuspatial/html"
+mv _text/* "${RAPIDS_DOCS_DIR}/cuspatial/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/cuspatial/${VERSION_NUMBER}/html"
-  aws s3 sync --no-progress --delete docs/_text "s3://rapidsai-docs/cuspatial/${VERSION_NUMBER}/txt"
-  aws s3 sync --no-progress --delete cpp/doxygen/html "s3://rapidsai-docs/libcuspatial/${VERSION_NUMBER}/html"
-fi
\ No newline at end of file
+rapids-upload-docs
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index e1e77a5a1..4edd58d43 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -52,7 +52,7 @@ sed_runner "/TAGFILES/ s|[0-9]\+.[0-9]\+|${NEXT_SHORT_TAG}|g" cpp/doxygen/Doxyfi
 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
 
 # Need to distutils-normalize the original version
 NEXT_SHORT_TAG_PEP440=$(python -c "from setuptools.extern import packaging; print(packaging.version.Version('${NEXT_SHORT_TAG}'))")