From 353bf21c4d75276eae4f9117d6178e1307a61db6 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 9 Oct 2024 17:09:54 -0500
Subject: [PATCH] rapids-version instead of rapids-version-major-minor

---
 ci/build_docs.sh  | 7 +++----
 ci/test_cpp.sh    | 6 +++---
 ci/test_python.sh | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index d87b9ee87..dca22fb36 100755
--- a/ci/build_docs.sh
+++ b/ci/build_docs.sh
@@ -6,8 +6,7 @@ set -euo pipefail
 rapids-logger "Create test conda environment"
 . /opt/conda/etc/profile.d/conda.sh
 
-RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
-export RAPIDS_VERSION_NUMBER="${RAPIDS_VERSION_MAJOR_MINOR}"
+RAPIDS_VERSION="$(rapids-version)"
 
 rapids-dependency-file-generator \
   --output conda \
@@ -29,7 +28,7 @@ export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
-  "libwholegraph=${RAPIDS_VERSION_MAJOR_MINOR}"
+  "libwholegraph=${RAPIDS_VERSION}"
 
 rapids-logger "Build Doxygen docs"
 pushd cpp
@@ -40,4 +39,4 @@ popd
 
 rapids-logger "Output temp dir: ${RAPIDS_DOCS_DIR}"
 
-rapids-upload-docs
+RAPIDS_VERSION_NUMBER="$(rapids-verion-major-minor)" rapids-upload-docs
diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
index 0f7fbae0f..09ecf7a83 100755
--- a/ci/test_cpp.sh
+++ b/ci/test_cpp.sh
@@ -8,7 +8,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
 
 . /opt/conda/etc/profile.d/conda.sh
 
-RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
+RAPIDS_VERSION="$(rapids-version)"
 
 rapids-logger "Generate C++ testing dependencies"
 rapids-dependency-file-generator \
@@ -31,8 +31,8 @@ rapids-print-env
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
-  "libwholegraph=${RAPIDS_VERSION_MAJOR_MINOR}" \
-  "libwholegraph-tests=${RAPIDS_VERSION_MAJOR_MINOR}"
+  "libwholegraph=${RAPIDS_VERSION}" \
+  "libwholegraph-tests=${RAPIDS_VERSION}"
 
 rapids-logger "Check GPU usage"
 nvidia-smi
diff --git a/ci/test_python.sh b/ci/test_python.sh
index b6e3c95fc..758a25dc7 100755
--- a/ci/test_python.sh
+++ b/ci/test_python.sh
@@ -8,7 +8,7 @@ cd "$(dirname "$(realpath "${BASH_SOURCE[0]}")")"/../
 
 . /opt/conda/etc/profile.d/conda.sh
 
-RAPIDS_VERSION_MAJOR_MINOR="$(rapids-version-major-minor)"
+RAPIDS_VERSION="$(rapids-version)"
 
 ARCH=$(arch)
 EXITCODE=0
@@ -50,7 +50,7 @@ rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
   'mkl<2024.1.0' \
-  "pylibwholegraph=${RAPIDS_VERSION_MAJOR_MINOR}"
+  "pylibwholegraph=${RAPIDS_VERSION}"
 
 rapids-logger "Check GPU usage"
 nvidia-smi