From f7e6999d02c2ab8722241f2d73c818372f138ef9 Mon Sep 17 00:00:00 2001
From: Christopher Harris <xixonia@gmail.com>
Date: Tue, 11 Jul 2023 15:16:52 +0000
Subject: [PATCH 1/3] use libgrpc

---
 ci/conda/environments/dev_env.yml               |  2 +-
 ci/conda/recipes/libmrc/conda_build_config.yaml | 16 ++--------------
 ci/conda/recipes/libmrc/meta.yaml               |  8 ++++----
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml
index f7ded3713..58d83d9a7 100644
--- a/ci/conda/environments/dev_env.yml
+++ b/ci/conda/environments/dev_env.yml
@@ -40,7 +40,7 @@ dependencies:
   - glog=0.6
   - gmock=1.13
   - graphviz=3.0
-  - grpc-cpp=1.51
+  - libgrpc=1.54.0
   - gtest=1.13
   - gxx=11.2 # Specifies which versions of GXX and GCC to use
   - isort
diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml
index 04cd535d0..4592176ca 100644
--- a/ci/conda/recipes/libmrc/conda_build_config.yaml
+++ b/ci/conda/recipes/libmrc/conda_build_config.yaml
@@ -26,14 +26,10 @@ cuda_compiler_version:
   - 11.8
 
 python:
-  - 3.8
-  - 3.10
   - 3.10
 
 # Setup the dependencies to build with multiple versions of RAPIDS
 rapids_version: # Keep around compatibility with current version -2
-  - 23.02
-  - 23.04
   - 23.06
 
 # Multiple versions of abseil are required to satisfy the solver for some
@@ -42,23 +38,15 @@ rapids_version: # Keep around compatibility with current version -2
 # together to avoid impossible combinations
 libabseil:
   - 20230125.0
-  - 20230125.0
-  - 20230125.0
 
-grpc_cpp:
-  - 1.51
-  - 1.51
-  - 1.51
+libgrpc:
+  - 1.54
 
 ucx:
-  - 1.13
-  - 1.14
   - 1.14
 
 libprotobuf:
   - 3.21
-  - 3.21
-  - 3.21
 
 zip_keys:
   - python
diff --git a/ci/conda/recipes/libmrc/meta.yaml b/ci/conda/recipes/libmrc/meta.yaml
index b4be6cd94..6abbd7c19 100644
--- a/ci/conda/recipes/libmrc/meta.yaml
+++ b/ci/conda/recipes/libmrc/meta.yaml
@@ -59,7 +59,7 @@ requirements:
     - gflags
     - glog
     - gmock 1.13.*
-    - grpc-cpp
+    - libgrpc
     - gtest 1.13.*
     - libabseil
     - libhwloc 2.5.*
@@ -96,10 +96,10 @@ outputs:
         - boost-cpp
         - cuda-cudart # Needed to allow pin_compatible to work
         - glog
-        - grpc-cpp
-        - libabseil # Needed for transitive run_exports from grpc-cpp. Does not need a version
+        - libgrpc
+        - libabseil # Needed for transitive run_exports from libgrpc. Does not need a version
         - libhwloc 2.5.*
-        - libprotobuf # Needed for transitive run_exports from grpc-cpp. Does not need a version
+        - libprotobuf # Needed for transitive run_exports from libgrpc. Does not need a version
         - librmm {{ rapids_version }}
         - nlohmann_json 3.9.*
         - ucx

From beb041744dff60dff225e5af585397f29ad39a6e Mon Sep 17 00:00:00 2001
From: Christopher Harris <xixonia@gmail.com>
Date: Tue, 11 Jul 2023 15:18:42 +0000
Subject: [PATCH 2/3] remove zip

---
 ci/conda/recipes/libmrc/conda_build_config.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml
index 4592176ca..27386cb97 100644
--- a/ci/conda/recipes/libmrc/conda_build_config.yaml
+++ b/ci/conda/recipes/libmrc/conda_build_config.yaml
@@ -48,14 +48,6 @@ ucx:
 libprotobuf:
   - 3.21
 
-zip_keys:
-  - python
-  - rapids_version
-  - libabseil
-  - grpc_cpp
-  - ucx
-  - libprotobuf
-
 # The following mimic what is available in the pinning feedstock:
 # https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
 boost:

From 0a8a0fbda6323e5af9194885bb410954b2e70677 Mon Sep 17 00:00:00 2001
From: Christopher Harris <xixonia@gmail.com>
Date: Tue, 11 Jul 2023 16:14:32 +0000
Subject: [PATCH 3/3] add build matrix back in

---
 .../recipes/libmrc/conda_build_config.yaml    | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/ci/conda/recipes/libmrc/conda_build_config.yaml b/ci/conda/recipes/libmrc/conda_build_config.yaml
index 27386cb97..008688e98 100644
--- a/ci/conda/recipes/libmrc/conda_build_config.yaml
+++ b/ci/conda/recipes/libmrc/conda_build_config.yaml
@@ -26,10 +26,14 @@ cuda_compiler_version:
   - 11.8
 
 python:
+  - 3.8
+  - 3.10
   - 3.10
 
 # Setup the dependencies to build with multiple versions of RAPIDS
 rapids_version: # Keep around compatibility with current version -2
+  - 23.02
+  - 23.04
   - 23.06
 
 # Multiple versions of abseil are required to satisfy the solver for some
@@ -38,15 +42,31 @@ rapids_version: # Keep around compatibility with current version -2
 # together to avoid impossible combinations
 libabseil:
   - 20230125.0
+  - 20230125.0
+  - 20230125.0
 
 libgrpc:
+  - 1.51
+  - 1.51
   - 1.54
 
 ucx:
+  - 1.13
+  - 1.14
   - 1.14
 
 libprotobuf:
   - 3.21
+  - 3.21
+  - 3.21
+
+zip_keys:
+  - python
+  - rapids_version
+  - libabseil
+  - libgrpc
+  - ucx
+  - libprotobuf
 
 # The following mimic what is available in the pinning feedstock:
 # https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml
@@ -59,7 +79,6 @@ gflags:
 glog:
   - 0.6
 
-
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x