From 1f20b49b81bd324dfe7e0fd14d6b88e1b8e71e6b Mon Sep 17 00:00:00 2001 From: Brian Szmyd Date: Wed, 2 Aug 2023 15:07:17 -0700 Subject: [PATCH] Remove home_repl dep for now --- .github/workflows/build_commit.yml | 42 +----------------------------- conanfile.py | 2 +- src/CMakeLists.txt | 5 ++-- 3 files changed, 5 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build_commit.yml b/.github/workflows/build_commit.yml index 1e8036fe..6f774bb5 100644 --- a/.github/workflows/build_commit.yml +++ b/.github/workflows/build_commit.yml @@ -26,48 +26,8 @@ jobs: malloc-impl: ${{ inputs.malloc-impl }} prerelease: ${{ inputs.prerelease }} if: ${{ github.event_name != 'pull_request' }} - NuRaftMesgDeps: - needs: SislDeps - uses: eBay/nuraft_mesg/.github/workflows/build_dependencies.yml@main - with: - branch: main - platform: ${{ inputs.platform }} - build-type: ${{ inputs.build-type }} - malloc-impl: ${{ inputs.malloc-impl }} - prerelease: ${{ inputs.prerelease }} - if: ${{ github.event_name != 'pull_request' }} - IOMgrDeps: - needs: SislDeps - uses: eBay/iomanager/.github/workflows/build_dependencies.yml@master - with: - branch: master - platform: ${{ inputs.platform }} - build-type: ${{ inputs.build-type }} - malloc-impl: ${{ inputs.malloc-impl }} - prerelease: ${{ inputs.prerelease }} - if: ${{ github.event_name != 'pull_request' }} - HomeStoreDeps: - needs: IOMgrDeps - uses: eBay/homestore/.github/workflows/build_dependencies.yml@master - with: - branch: master - platform: ${{ inputs.platform }} - build-type: ${{ inputs.build-type }} - malloc-impl: ${{ inputs.malloc-impl }} - prerelease: ${{ inputs.prerelease }} - if: ${{ github.event_name != 'pull_request' }} - HomeReplDeps: - needs: [HomeStoreDeps, NuRaftMesgDeps] - uses: eBay/homereplication/.github/workflows/build_dependencies.yml@main - with: - branch: ${{ github.ref }} - platform: ${{ inputs.platform }} - build-type: ${{ inputs.build-type }} - malloc-impl: ${{ inputs.malloc-impl }} - prerelease: ${{ inputs.prerelease }} - if: ${{ github.event_name != 'pull_request' }} HomeObjectDeps: - needs: [HomeReplDeps] + needs: [SislDeps] uses: ./.github/workflows/build_dependencies.yml with: branch: ${{ github.ref }} diff --git a/conanfile.py b/conanfile.py index 790b6de8..efd52e00 100644 --- a/conanfile.py +++ b/conanfile.py @@ -41,7 +41,7 @@ def build_requirements(self): self.build_requires("gtest/1.13.0") def requirements(self): - self.requires("home_replication/[~=0, include_prerelease=True]@oss/main") + #self.requires("home_replication/[~=0, include_prerelease=True]@oss/main") self.requires("sisl/[~=9, include_prerelease=True]@oss/master") self.requires("openssl/1.1.1s", override=True) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a118a823..d96c920d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,9 @@ cmake_minimum_required (VERSION 3.11) find_package(Threads QUIET REQUIRED) -find_package(homestore QUIET REQUIRED) -find_package(home_replication QUIET REQUIRED) +find_package(sisl QUIET REQUIRED) +#find_package(homestore QUIET REQUIRED) +#find_package(home_replication QUIET REQUIRED) find_package(GTest QUIET REQUIRED)