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.

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

Update NuRaft for fix: https://github.com/eBay/NuRaft/pull/526 #96

Merged
merged 1 commit into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
- name: Export Recipes
run: |
conan export import/sisl oss/master
conan export 3rd_party/nuraft nuraft/2.4.1@
conan export 3rd_party/nuraft nuraft/2.4.2@
cached_pkgs=$(ls -1d ~/.conan/data/*/*/*/*/package | sed 's,.*data/,,' | cut -d'/' -f1,2 | paste -sd',' - -)
echo "::info:: Pre-cached: ${cached_pkgs}"
if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
Expand Down
7 changes: 7 additions & 0 deletions 3rd_party/nuraft/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"2.4.2":
url: "https://github.com/eBay/nuraft/archive/a4029e132560c06445918bd84471863cb1537a3c.tar.gz"
sha256: "f719f89b41175ec3e110d230b788d7a0ab74a691b0a03687f801d1f7af9fe91b"
"2.4.1":
url: "https://github.com/eBay/nuraft/archive/f4c8e057080419cc9c845cfb7df95d7c9b2193c4.tar.gz"
sha256: "ba380efe7e9f432a5b48a0bc3426a33128a791d6f7dbcd30ffcad4634fdde5b0"
Expand All @@ -8,6 +11,10 @@ sources:
"2.3.0":
url: "https://github.com/eBay/nuraft/archive/f42b12c3ec9f20a085de61e1294e8167fa747c7d.tar.gz"
patches:
"2.4.2":
- patch_file: "patches/2-4-0.patch"
patch_description: "Dependency discovery"
patch_type: "conan"
"2.4.1":
- patch_file: "patches/2-4-0.patch"
patch_description: "Dependency discovery"
Expand Down
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class NuRaftMesgConan(ConanFile):
name = "nuraft_mesg"
version = "3.5.8"
version = "3.5.9"

homepage = "https://github.com/eBay/nuraft_mesg"
description = "A gRPC service for NuRAFT"
Expand Down Expand Up @@ -67,7 +67,7 @@ def build_requirements(self):
def requirements(self):
self.requires("boost/1.83.0", transitive_headers=True)
self.requires("sisl/[^12.2]@oss/master", transitive_headers=True)
self.requires("nuraft/2.4.1", transitive_headers=True)
self.requires("nuraft/2.4.2", transitive_headers=True)

def layout(self):
cmake_layout(self)
Expand Down
Loading