diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml index 21ef6f3..8a8cf84 100644 --- a/.github/workflows/build_dependencies.yml +++ b/.github/workflows/build_dependencies.yml @@ -130,7 +130,7 @@ jobs: - name: Export Recipes run: | conan export import/sisl oss/master - conan export 3rd_party/nuraft nuraft/2.4.0@ + conan export 3rd_party/nuraft nuraft/2.4.1@ 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' }} diff --git a/3rd_party/nuraft/conandata.yml b/3rd_party/nuraft/conandata.yml index 4bad29a..a06a83d 100644 --- a/3rd_party/nuraft/conandata.yml +++ b/3rd_party/nuraft/conandata.yml @@ -1,10 +1,17 @@ sources: + "2.4.1": + url: "https://github.com/eBay/nuraft/archive/f4c8e057080419cc9c845cfb7df95d7c9b2193c4.tar.gz" + sha256: "ba380efe7e9f432a5b48a0bc3426a33128a791d6f7dbcd30ffcad4634fdde5b0" "2.4.0": url: "https://github.com/eBay/nuraft/archive/929132f5a0e86ab3070055c63b485a512f82bcb0.tar.gz" sha256: "8894be82d396fe3b8eb3ed6e03e65e398c81779bf8c1f8e2345530f8e80da5b3" "2.3.0": url: "https://github.com/eBay/nuraft/archive/f42b12c3ec9f20a085de61e1294e8167fa747c7d.tar.gz" patches: + "2.4.1": + - patch_file: "patches/2-4-0.patch" + patch_description: "Dependency discovery" + patch_type: "conan" "2.4.0": - patch_file: "patches/2-4-0.patch" patch_description: "Dependency discovery" diff --git a/conanfile.py b/conanfile.py index 7794869..0c4d9ca 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,7 @@ class NuRaftMesgConan(ConanFile): name = "nuraft_mesg" - version = "3.5.7" + version = "3.5.8" homepage = "https://github.com/eBay/nuraft_mesg" description = "A gRPC service for NuRAFT" @@ -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.0", transitive_headers=True) + self.requires("nuraft/2.4.1", transitive_headers=True) def layout(self): cmake_layout(self)