From e9d896a4e61a9391d7dcbd39c4c3de930d038501 Mon Sep 17 00:00:00 2001
From: Gil Forsyth <gforsyth@nvidia.com>
Date: Tue, 18 Feb 2025 10:46:08 -0500
Subject: [PATCH] Revert "revert to sequential solves"

This reverts commit dc5fb013953e3d45409c5fbef11c5fef6e194c6a.
---
 ci/test_cpp.sh    | 10 ++++------
 dependencies.yaml |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
index 4ba92097..1c8edb64 100755
--- a/ci/test_cpp.sh
+++ b/ci/test_cpp.sh
@@ -9,7 +9,6 @@ source "$(dirname "$0")/test_common.sh"
 
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
-export UCXX_VERSION="$(head -1 ./VERSION)"
 
 rapids-logger "Create test conda environment"
 . /opt/conda/etc/profile.d/conda.sh
@@ -18,16 +17,15 @@ rapids-dependency-file-generator \
   --output conda \
   --file-key test_cpp \
   --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" \
+  --prepend-channel "${CPP_CHANNEL}" \
   | tee env.yaml
 
+# Heinous hack time!
+sed -i "s#- libucxx#$- ${CPP_CHANNEL}::libucxx#" env.yaml
+
 rapids-mamba-retry env create --yes -f env.yaml -n test
 conda activate test
 
-rapids-mamba-retry install \
-  --channel "${CPP_CHANNEL}" \
-  "libucxx=${UCXX_VERSION}"
-
-
 rapids-print-env
 
 print_system_stats
diff --git a/dependencies.yaml b/dependencies.yaml
index b1ecd43a..84125c7b 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -30,9 +30,9 @@ files:
     includes:
       - cuda_version
       - test_cpp
-      # - depends_on_libucxx
-      # - depends_on_libucxx_examples
-      # - depends_on_libucxx_tests
+      - depends_on_libucxx
+      - depends_on_libucxx_examples
+      - depends_on_libucxx_tests
   test_python:
     output: none
     includes: