bump up to iomgr 11 (eBay#70)

Co-authored-by: zilai <[email protected]>
sanebay · Dec 27, 2023 · 51e735b · 51e735b
1 parent c99fd9b
commit 51e735b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/build_commit.yml b/.github/workflows/build_commit.yml
@@ -20,10 +20,10 @@ on:
         type: string
 
 jobs:
-  Sisl10Deps:
-    uses: eBay/sisl/.github/workflows/build_dependencies.yml@stable/v10.x
+  SislDeps:
+    uses: eBay/sisl/.github/workflows/build_dependencies.yml@master
     with:
-      branch: stable/v10.x
+      branch: master
       platform: ${{ inputs.platform }}
       build-type: ${{ inputs.build-type }}
       malloc-impl: ${{ inputs.malloc-impl }}
@@ -32,7 +32,7 @@ jobs:
     if: ${{ github.event_name != 'pull_request' }}
 
   IOMgrDeps:
-    needs: Sisl10Deps
+    needs: SislDeps
     uses: ./.github/workflows/build_dependencies.yml
     with:
       branch: ${{ github.ref }}

diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml
@@ -109,15 +109,15 @@ jobs:
       with:
         repository: eBay/sisl
         path: import/sisl
-        ref: stable/v10.x
+        ref: master
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Load Sisl Cache
       uses: eBay/sisl/.github/actions/load_conan@stable/v8.x
       with:
         testing: 'False'
         path: import/sisl
-        key_prefix: Sisl10Deps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
+        key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
         fail_on_cache_miss: true
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
@@ -130,7 +130,7 @@ jobs:
     - name: Prepare Recipes
       run: |
         ./prepare.sh
-        conan export import/sisl
+        conan export import/sisl oss/master
         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' }}
@@ -158,7 +158,7 @@ jobs:
       with:
         testing: 'False'
         path: import/sisl
-        key_prefix: Sisl10Deps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
+        key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
         fail_on_cache_miss: true
       if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
 

diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@
 
 class IOMgrConan(ConanFile):
     name = "iomgr"
-    version = "10.0.7"
+    version = "11.0.1"
 
     homepage = "https://github.com/eBay/IOManager"
     description = "Asynchronous event manager"
@@ -54,8 +54,7 @@ def build_requirements(self):
         self.build_requires("cpr/1.10.4")
 
     def requirements(self):
-        self.requires("sisl/[>=10.3]")
-
+        self.requires("sisl/[~=11, include_prerelease=True]@oss/master")
         if self.options.grpc_support:
             self.requires("grpc/1.50.1")
             self.requires("grpc_internal/1.48.0")

diff --git a/src/lib/iomgr.cpp b/src/lib/iomgr.cpp
@@ -69,8 +69,8 @@ SISL_OPTION_GROUP(iomgr,
                   (hdd_streams, "", "hdd_streams", "Number of streams for hdd - overridden value",
                    ::cxxopts::value< uint32_t >(), "count"))
 
-// SISL v11 change
-//SISL_LOGGING_DEF(iomgr)
+//SISL v11 change
+SISL_LOGGING_DEF(iomgr)
 
 namespace iomgr {
 

diff --git a/src/lib/spdk/iomgr_impl_spdk.cpp b/src/lib/spdk/iomgr_impl_spdk.cpp
@@ -26,7 +26,7 @@ extern "C" {
 }
 
 // SISL v11 change
-//SISL_LOGGING_DEF(spdk)
+SISL_LOGGING_DEF(spdk)
 
 namespace iomgr {
 bool IOManagerSpdkImpl::g_spdk_env_prepared{false};

diff --git a/src/lib/watchdog.cpp b/src/lib/watchdog.cpp
@@ -4,7 +4,7 @@
 #include "iomgr_config.hpp"
 
 // SISL v11 change
-//SISL_LOGGING_DEF(io_wd)
+SISL_LOGGING_DEF(io_wd)
 
 namespace iomgr {
 IOWatchDog::IOWatchDog() {