From 1d9e1e97b594c2c84e175f37ab967bb853692255 Mon Sep 17 00:00:00 2001
From: James Lamb <jlamb@nvidia.com>
Date: Wed, 15 Jan 2025 08:29:00 -0800
Subject: [PATCH] make builds depends on builds, stop passing DETECT_CONDA_ENV
 in wheel-building scripts, add new deps to update-version.sh

---
 .github/workflows/build.yaml | 3 ++-
 ci/build_wheel_libraft.sh    | 6 +++---
 ci/build_wheel_pylibraft.sh  | 3 ---
 ci/build_wheel_raft_dask.sh  | 3 ---
 ci/release/update-version.sh | 2 ++
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index af6cb910e5..d484bcae22 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -89,7 +89,7 @@ jobs:
       package-name: libraft
       package-type: cpp
   wheel-build-pylibraft:
-    needs: wheel-publish-libraft
+    needs: wheel-build-libraft
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
     with:
@@ -110,6 +110,7 @@ jobs:
       package-name: pylibraft
       package-type: python
   wheel-build-raft-dask:
+    needs: wheel-build-libraft
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.02
     with:
diff --git a/ci/build_wheel_libraft.sh b/ci/build_wheel_libraft.sh
index 27c7270a1c..825a5124a8 100755
--- a/ci/build_wheel_libraft.sh
+++ b/ci/build_wheel_libraft.sh
@@ -30,14 +30,14 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
 
 case "${RAPIDS_CUDA_VERSION}" in
   12.*)
-    EXTRA_CMAKE_ARGS=";-DUSE_CUDA_MATH_WHEELS=ON"
+    EXTRA_CMAKE_ARGS="-DUSE_CUDA_MATH_WHEELS=ON"
   ;;
   11.*)
-    EXTRA_CMAKE_ARGS=";-DUSE_CUDA_MATH_WHEELS=OFF"
+    EXTRA_CMAKE_ARGS="-DUSE_CUDA_MATH_WHEELS=OFF"
   ;;
 esac
 
-export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF${EXTRA_CMAKE_ARGS}"
+export SKBUILD_CMAKE_ARGS="${EXTRA_CMAKE_ARGS}"
 
 ci/build_wheel.sh libraft ${package_dir} cpp
 ci/validate_wheel.sh ${package_dir} final_dist libraft
diff --git a/ci/build_wheel_pylibraft.sh b/ci/build_wheel_pylibraft.sh
index f88aaaa6e1..6f74e0e8c5 100755
--- a/ci/build_wheel_pylibraft.sh
+++ b/ci/build_wheel_pylibraft.sh
@@ -16,8 +16,5 @@ RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-f
 echo "libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libraft_dist/libraft_*.whl)" > /tmp/constraints.txt
 export PIP_CONSTRAINT="/tmp/constraints.txt"
 
-# Set up skbuild options. Enable sccache in skbuild config options
-export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF"
-
 ci/build_wheel.sh pylibraft ${package_dir} python
 ci/validate_wheel.sh ${package_dir} final_dist pylibraft
diff --git a/ci/build_wheel_raft_dask.sh b/ci/build_wheel_raft_dask.sh
index 79334c9f45..0cacb6fe30 100755
--- a/ci/build_wheel_raft_dask.sh
+++ b/ci/build_wheel_raft_dask.sh
@@ -16,8 +16,5 @@ RAPIDS_PY_WHEEL_NAME="libraft_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-f
 echo "libraft-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo /tmp/libraft_dist/libraft_*.whl)" > /tmp/constraints.txt
 export PIP_CONSTRAINT="/tmp/constraints.txt"
 
-# Set up skbuild options. Enable sccache in skbuild config options
-export SKBUILD_CMAKE_ARGS="-DDETECT_CONDA_ENV=OFF"
-
 ci/build_wheel.sh raft-dask ${package_dir} python
 ci/validate_wheel.sh ${package_dir} final_dist raft-dask
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
index a70fed9ec8..1ab9157b89 100755
--- a/ci/release/update-version.sh
+++ b/ci/release/update-version.sh
@@ -43,6 +43,8 @@ echo "${NEXT_FULL_TAG}" > VERSION
 
 DEPENDENCIES=(
   dask-cuda
+  libraft
+  librmm
   pylibraft
   rmm
   rapids-dask-dependency