Skip to content

Commit

Permalink
Consolidate dpdk (#528)
Browse files Browse the repository at this point in the history
* Update DPDK/SPDK recipes.
* Remove unused build type.
  • Loading branch information
szmyd authored Aug 27, 2024
1 parent 4d89a7f commit 20adc34
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/merge_build_3x.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 2 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 20adc34

Please sign in to comment.