From f135693bdfe4f9fa0c84d2006569802f6f25b2a9 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 8 Oct 2024 17:04:35 -0500 Subject: [PATCH 1/4] remove unused variables in build_docs script --- ci/build_docs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 3ce57b2d8..928a63093 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -21,8 +21,6 @@ conda activate docs rapids-print-env -export RAPIDS_VERSION="$(rapids-version)" -export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" export RAPIDS_VERSION_NUMBER="24.12" export RAPIDS_DOCS_DIR="$(mktemp -d)" From ccba04844abd1e407e5110617573a0fd67a6b851 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 9 Oct 2024 16:57:56 -0500 Subject: [PATCH 2/4] remove some hard-coding from update-version.sh --- ci/build_docs.sh | 3 +-- ci/release/update-version.sh | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 928a63093..61a927969 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -21,7 +21,6 @@ conda activate docs rapids-print-env -export RAPIDS_VERSION_NUMBER="24.12" export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-logger "Build cuSpatial CPP docs" @@ -52,4 +51,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/cuproj/html" mv _html/* "${RAPIDS_DOCS_DIR}/cuproj/html" popd -rapids-upload-docs +RAPIDS_VERSION_NUMBER="$(rapids-version-major-minor)" rapids-upload-docs diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 03c05e9c4..dfd0fe7e3 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -40,7 +40,6 @@ echo "${NEXT_FULL_TAG}" > VERSION for FILE in .github/workflows/*.yaml; do sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}" done -sed_runner "s/RAPIDS_VERSION_NUMBER=\".*/RAPIDS_VERSION_NUMBER=\"${NEXT_SHORT_TAG}\"/g" ci/build_docs.sh DEPENDENCIES=( pylibcudf From 0cba18664434020b34f6e4ff4e020ba40478763f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 08:56:51 -0500 Subject: [PATCH 3/4] restore RAPIDS_VERSION and RAPIDS_VERSION_MAJOR_MINOR --- ci/build_docs.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 61a927969..f69d838dd 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -21,6 +21,8 @@ conda activate docs rapids-print-env +export RAPIDS_VERSION="$(rapids-version)" +export RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)" export RAPIDS_DOCS_DIR="$(mktemp -d)" rapids-logger "Build cuSpatial CPP docs" From 3c1dd86c88fac8a2cfd1bf30d93da4930604fc5f Mon Sep 17 00:00:00 2001 From: James Lamb Date: Thu, 10 Oct 2024 08:59:20 -0500 Subject: [PATCH 4/4] Update ci/build_docs.sh --- ci/build_docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index f69d838dd..ab2b56c35 100755 --- a/ci/build_docs.sh +++ b/ci/build_docs.sh @@ -53,4 +53,4 @@ mkdir -p "${RAPIDS_DOCS_DIR}/cuproj/html" mv _html/* "${RAPIDS_DOCS_DIR}/cuproj/html" popd -RAPIDS_VERSION_NUMBER="$(rapids-version-major-minor)" rapids-upload-docs +RAPIDS_VERSION_NUMBER="${RAPIDS_VERSION_MAJOR_MINOR}" rapids-upload-docs