From 20adc34f5ec2e390a8cdcda301e2159bb045d27b Mon Sep 17 00:00:00 2001
From: Brian Szmyd <brian.szmyd@protonmail.com>
Date: Tue, 27 Aug 2024 12:35:05 -0600
Subject: [PATCH] Consolidate dpdk (#528)

* Update DPDK/SPDK recipes.
* Remove unused build type.
---
 .github/workflows/merge_build_3x.yml | 8 +-------
 conanfile.py                         | 5 ++---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/merge_build_3x.yml b/.github/workflows/merge_build_3x.yml
index 2744dd33d..8ecfca0ce 100644
--- a/.github/workflows/merge_build_3x.yml
+++ b/.github/workflows/merge_build_3x.yml
@@ -11,22 +11,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: ["ubuntu-22.04", "ubuntu-20.04"]
+        platform: ["ubuntu-22.04"]
         build-type: ["Debug", "Release"]
         malloc-impl: ["libc", "tcmalloc"]
         prerelease: ["True", "False"]
         exclude:
-          - build-type: Debug
-            platform: ubuntu-20.04
           - build-type: Debug
             malloc-impl: tcmalloc
-          - malloc-impl: tcmalloc
-            platform: ubuntu-20.04
           - malloc-impl: libc
             build-type: Release
             platform: ubuntu-22.04
-          - prerelease: "True"
-            platform: ubuntu-20.04
     uses: ./.github/workflows/build_commit.yml
     with:
       platform: ${{ matrix.platform }}
diff --git a/conanfile.py b/conanfile.py
index 048f46f9b..8579566d4 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -2,7 +2,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "3.8.1"
+    version = "3.8.2"
 
     homepage = "https://github.corp.ebay.com/SDS/homestore"
     description = "HomeStore"
@@ -54,7 +54,7 @@ def build_requirements(self):
         self.build_requires("gtest/1.12.1")
 
     def requirements(self):
-        self.requires("iomgr/[~=8]")
+        self.requires("iomgr/[^8.8]")
         self.requires("sisl/[~=8]")
 
         # FOSS, rarely updated
@@ -63,7 +63,6 @@ def requirements(self):
         self.requires("folly/2022.01.31.00")
         self.requires("isa-l/2.30.0")
         self.requires("nlohmann_json/3.11.2")
-        self.requires("spdk/21.07.y")
 
     def build(self):
         cmake = CMake(self)