Fix more CI locations

rapidsai · Feb 3, 2025 · bb45348 · bb45348
1 parent b8a9dd0
commit bb45348
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -18,7 +18,9 @@ rapids-logger "Begin cpp build"
 sccache --zero-stats
 LIBRMM_CHANNEL=$(_rapids-get-pr-artifact rmm 1808 cpp conda)
 
-RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild --channel "${LIBRMM_CHANNEL}" conda/recipes/libraft
+RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \
+  --channel "${LIBRMM_CHANNEL}" \
+  conda/recipes/libraft
 
 sccache --show-adv-stats
 

diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -19,7 +19,6 @@ CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 LIBRMM_CHANNEL=$(_rapids-get-pr-artifact rmm 1808 cpp conda)
 PYLIBRMM_CHANNEL=$(_rapids-get-pr-artifact rmm 1808 python conda)
 LIBUCXX_CHANNEL=$(_rapids-get-pr-artifact ucxx 364 cpp conda)
-PYLIBUCXX_CHANNEL=$(_rapids-get-pr-artifact ucxx 364 python conda)
 
 version=$(rapids-generate-version)
 git_commit=$(git rev-parse HEAD)
@@ -46,7 +45,6 @@ rapids-conda-retry mambabuild \
   --channel "${LIBRMM_CHANNEL}" \
   --channel "${PYLIBRMM_CHANNEL}" \
   --channel "${LIBUCXX_CHANNEL}" \
-  --channel "${PYLIBUCXX_CHANNEL}" \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/raft-dask
 

diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -23,6 +23,8 @@ set +u
 conda activate test
 set -u
 
+LIBRMM_CHANNEL=$(_rapids-get-pr-artifact rmm 1808 cpp conda)
+
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"
@@ -31,6 +33,7 @@ rapids-print-env
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
   "libraft-headers=${RAPIDS_VERSION}" \
   "libraft=${RAPIDS_VERSION}" \
   "libraft-tests=${RAPIDS_VERSION}"

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -23,6 +23,9 @@ set +u
 conda activate test
 set -u
 
+LIBRMM_CHANNEL=$(_rapids-get-pr-artifact rmm 1808 cpp conda)
+PYLIBRMM_CHANNEL=$(_rapids-get-pr-artifact rmm 1808 python conda)
+
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
@@ -36,6 +39,8 @@ rapids-print-env
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
+  --channel "${LIBRMM_CHANNEL}" \
+  --channel "${PYLIBRMM_CHANNEL}" \
   "libraft=${RAPIDS_VERSION}" \
   "libraft-headers=${RAPIDS_VERSION}" \
   "pylibraft=${RAPIDS_VERSION}" \