Bump dependencies and run tests in parallel

.github/workflows/build_commit.yml

@@ -18,9 +18,9 @@ on:
 
 jobs:
   SislDeps:
-    uses: ebay/sisl/.github/workflows/build_dependencies.yml@master
+    uses: ebay/sisl/.github/workflows/build_dependencies.yml@stable/v13.x
     with:
-      branch: master
+      branch: stable/v13.x
       platform: ${{ inputs.platform }}
       build-type: ${{ inputs.build-type }}
       malloc-impl: ${{ inputs.malloc-impl }}
@@ -29,9 +29,9 @@ jobs:
 
   NuraftMesgDeps:
     needs: SislDeps
-    uses: eBay/nuraft_mesg/.github/workflows/build_dependencies.yml@main
+    uses: eBay/nuraft_mesg/.github/workflows/build_dependencies.yml@stable/v4.x
     with:
-      branch: main
+      branch: stable/v4.x
       platform: ${{ inputs.platform }}
       build-type: ${{ inputs.build-type }}
       malloc-impl: ${{ inputs.malloc-impl }}
@@ -40,9 +40,9 @@ jobs:
 
   IOMgrDeps:
     needs: [SislDeps]
-    uses: eBay/iomanager/.github/workflows/build_dependencies.yml@master
+    uses: eBay/iomanager/.github/workflows/build_dependencies.yml@stable/v12.x
     with:
-      branch: master
+      branch: stable/v12.x
       platform: ${{ inputs.platform }}
       build-type: ${{ inputs.build-type }}
       malloc-impl: ${{ inputs.malloc-impl }}
@@ -52,9 +52,9 @@ jobs:
 
   HomeStoreDeps:
     needs: [IOMgrDeps, NuraftMesgDeps]
-    uses: eBay/homestore/.github/workflows/build_dependencies.yml@master
+    uses: eBay/homestore/.github/workflows/build_dependencies.yml@stable/v7.x
     with:
-      branch: master
+      branch: stable/v7.x
       platform: ${{ inputs.platform }}
       build-type: ${{ inputs.build-type }}
       malloc-impl: ${{ inputs.malloc-impl }}

.github/workflows/build_dependencies.yml

@@ -84,27 +84,27 @@ jobs:
       if: ${{ inputs.testing == 'False' }}
 
     - name: Setup Conan
-      uses: ebay/sisl/.github/actions/setup_conan2@master
+      uses: ebay/sisl/.github/actions/setup_conan2@stable/v13.x
       with:
         platform: ${{ inputs.platform }}
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Load HomeBlocks Cache
       id: restore-cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
+      uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
       with:
         testing: ${{ inputs.testing }}
         key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
 
     - name: Load Sisl Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
+      uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
       with:
         load_any: 'True'
         key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Load IOMgr Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
+      uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
       with:
         load_any: 'True'
         key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
@@ -115,42 +115,40 @@ jobs:
       with:
         repository: eBay/nuraft_mesg
         path: import/nuraft_mesg
-        ref: main
+        ref: stable/v4.x
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Load NuRaftMesg Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
+      uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
       with:
         testing: 'False'
         path: import/nuraft_mesg
         key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
-        fail_on_cache_miss: true
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Retrieve Dependencies HomeStore
       uses: actions/checkout@main
       with:
         repository: eBay/HomeStore
         path: import/homestore
-        ref: master
+        ref: stable/v7.x
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Load HomeStore Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
+      uses: eBay/sisl/.github/actions/load_conan2@stable/v13.x
       with:
         testing: 'False'
         path: import/homestore
         key_prefix: HomestoreDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
-        fail_on_cache_miss: true
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
 
     - name: Export Recipes
       run: |
         sudo apt-get install -y python3-pyelftools libaio-dev
         python -m pip install pyelftools
-        conan export --user oss --channel master import/homestore
-        conan export --user oss --channel main import/nuraft_mesg
+        conan export import/homestore
+        conan export import/nuraft_mesg
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Create and Test Package
@@ -170,7 +168,7 @@ jobs:
       if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }}
 
     - name: Save Conan Cache
-      uses: eBay/sisl/.github/actions/store_conan2@master
+      uses: eBay/sisl/.github/actions/store_conan2@stable/v13.x
       with:
         key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
       if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' && inputs.tooling != 'Coverage'}}

conanfile.py

@@ -2,14 +2,15 @@
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.build import check_min_cppstd
 from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake, cmake_layout
+from conan.tools.env import Environment
 from conan.tools.files import copy
 from os.path import join
 
 required_conan_version = ">=1.60.0"
 
 class HomeBlocksConan(ConanFile):
     name = "homeblocks"
-    version = "5.0.6"
+    version = "5.1.0"
 
     homepage = "https://github.com/eBay/HomeBlocks"
     description = "Block Store built on HomeStore"
@@ -46,9 +47,9 @@ def build_requirements(self):
         self.test_requires("gtest/1.17.0")
 
     def requirements(self):
-        self.requires("homestore/[^7.1]@oss/master", transitive_headers=True)
-        self.requires("iomgr/[^12.0]@oss/master", transitive_headers=True)
-        self.requires("sisl/[^13.0]@oss/master", transitive_headers=True)
+        self.requires("homestore/[^7.5]", transitive_headers=True)
+        self.requires("iomgr/[^12.0]", transitive_headers=True)
+        self.requires("sisl/[^13.2]", transitive_headers=True)
 
     def validate(self):
         if self.info.settings.compiler.cppstd:
@@ -98,7 +99,11 @@ def build(self):
         cmake.configure()
         cmake.build()
         if not self.conf.get("tools.build:skip_test", default=False):
-            cmake.test()
+            jobs = self.conf.get("tools.build:jobs", default=3)
+            env = Environment()
+            env.define("CTEST_PARALLEL_LEVEL", str(jobs))
+            with env.vars(self).apply():
+                cmake.test()
 
     def package(self):
         lib_dir = join(self.package_folder, "lib")