Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate dpdk #528

Merged
merged 3 commits into from
Aug 27, 2024
Merged

Consolidate dpdk #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3aa1962
Rely on iomanager for spdk
szmyd Aug 27, 2024
e5f9d53
Bump version
szmyd Aug 27, 2024
f0c856f
Remove unused build type.
szmyd Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/merge_build_3x.yml
View file
Open in desktop
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
View file
Open in desktop
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
Loading