From 3880ab338428779aaf2258c335a0becb2da6fddf Mon Sep 17 00:00:00 2001
From: Raymond Douglass <ray@raydouglass.com>
Date: Mon, 9 Nov 2020 16:14:10 -0500
Subject: [PATCH 1/2] FIX Prefer artifact of librmm during conda build of rmm

---
 ci/cpu/build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh
index e672e2f53..8ff09c1d3 100755
--- a/ci/cpu/build.sh
+++ b/ci/cpu/build.sh
@@ -66,7 +66,8 @@ if [[ "$BUILD_RMM" == "1" ]]; then
   if [[ -z "$PROJECT_FLASH" || "$PROJECT_FLASH" == "0" ]]; then
     conda build conda/recipes/rmm --python=$PYTHON
   else
-    conda build --dirty --no-remove-work-dir conda/recipes/rmm
+    conda build --dirty --no-remove-work-dir \
+      -c $WORKSPACE/ci/artifacts/rmm/cpu/conda-bld/ conda/recipes/rmm
   fi
 fi
 

From 6c0db881ab39a182e85ab049045d42df0df5bc3f Mon Sep 17 00:00:00 2001
From: Raymond Douglass <ray@raydouglass.com>
Date: Mon, 9 Nov 2020 16:16:59 -0500
Subject: [PATCH 2/2] DOC Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab38b667f..0ae6b0852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - PR #592 Add `auto_flush` to `make_logging_adaptor`
 - PR #602 Fix `device_scalar` and its tests so that they use the correct CUDA stream
 - PR #621 Make `rmm::cuda_stream_default` a `constexpr`
+- PR #625 Use `librmm` conda artifact when building `rmm` conda package
 
 # RMM 0.16.0 (21 Oct 2020)