From 03bcace5d2fb8c3516e590b373ff9aa90a900f5d Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyedwards@nvidia.com>
Date: Fri, 14 Feb 2025 14:34:48 -0500
Subject: [PATCH 1/2] Consolidate more Conda solves in CI

Issue: https://github.com/rapidsai/build-planning/issues/22
---
 ci/build_docs.sh  | 17 +++++++----------
 dependencies.yaml |  1 +
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index 30f3cd02..bfd45f4a 100755
--- a/ci/build_docs.sh
+++ b/ci/build_docs.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION.
+# Copyright (c) 2023-2025, NVIDIA CORPORATION.
 
 set -euo pipefail
 
+rapids-logger "Downloading artifacts from previous jobs"
+CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
+
 rapids-logger "Create test conda environment"
 . /opt/conda/etc/profile.d/conda.sh
 
-export UCXX_VERSION="$(head -1 ./VERSION)"
 UCXX_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2/' VERSION)"
 
 ENV_YAML_DIR="$(mktemp -d)"
@@ -14,20 +16,15 @@ ENV_YAML_DIR="$(mktemp -d)"
 rapids-dependency-file-generator \
   --output conda \
   --file-key docs \
-  --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" | tee "${ENV_YAML_DIR}/env.yaml"
+  --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch);py=${RAPIDS_PY_VERSION}" \
+  --prepend-channel "${CPP_CHANNEL}" \
+  | tee "${ENV_YAML_DIR}/env.yaml"
 
 rapids-mamba-retry env create --yes -f "${ENV_YAML_DIR}/env.yaml" -n docs
 conda activate docs
 
 rapids-print-env
 
-rapids-logger "Downloading artifacts from previous jobs"
-CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
-
-rapids-mamba-retry install \
-  --channel "${CPP_CHANNEL}" \
-  "libucxx=${UCXX_VERSION}"
-
 export RAPIDS_DOCS_DIR="$(mktemp -d)"
 
 rapids-logger "Build CPP docs"
diff --git a/dependencies.yaml b/dependencies.yaml
index 84125c7b..ea371406 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -64,6 +64,7 @@ files:
     includes:
       - docs
       - py_version
+      - depends_on_libucxx
   py_build_libucxx:
     output: pyproject
     pyproject_dir: python/libucxx

From 06e8ddc93b4aec0e0bc6453259899c629a2baa3e Mon Sep 17 00:00:00 2001
From: Kyle Edwards <kyedwards@nvidia.com>
Date: Fri, 14 Feb 2025 17:38:18 -0500
Subject: [PATCH 2/2] Review feedback

---
 ci/build_docs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
index bfd45f4a..f64831fe 100755
--- a/ci/build_docs.sh
+++ b/ci/build_docs.sh
@@ -9,6 +9,7 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 rapids-logger "Create test conda environment"
 . /opt/conda/etc/profile.d/conda.sh
 
+export UCXX_VERSION="$(head -1 ./VERSION)"
 UCXX_VERSION_MAJOR_MINOR="$(sed -E -e 's/^([0-9]+)\.([0-9]+)\.([0-9]+).*$/\1.\2/' VERSION)"
 
 ENV_YAML_DIR="$(mktemp -d)"