From c99fd9bff852b97ace47b80ae774ae07b2c33795 Mon Sep 17 00:00:00 2001
From: Brian Szmyd <brian.szmyd@protonmail.com>
Date: Fri, 15 Dec 2023 11:39:11 -0700
Subject: [PATCH] Revert sisl dependency to v10. (#68)

---
 .github/workflows/build_commit.yml       | 8 ++++----
 .github/workflows/build_dependencies.yml | 8 ++++----
 .github/workflows/merge_build.yml        | 2 +-
 conanfile.py                             | 2 +-
 src/lib/iomgr.cpp                        | 3 ++-
 src/lib/spdk/iomgr_impl_spdk.cpp         | 3 ++-
 src/lib/watchdog.cpp                     | 3 ++-
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_commit.yml b/.github/workflows/build_commit.yml
index 8245e0c..4e10567 100644
--- a/.github/workflows/build_commit.yml
+++ b/.github/workflows/build_commit.yml
@@ -20,10 +20,10 @@ on:
         type: string
 
 jobs:
-  SislDeps:
-    uses: eBay/sisl/.github/workflows/build_dependencies.yml@master
+  Sisl10Deps:
+    uses: eBay/sisl/.github/workflows/build_dependencies.yml@stable/v10.x
     with:
-      branch: master
+      branch: stable/v10.x
       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: SislDeps
+    needs: Sisl10Deps
     uses: ./.github/workflows/build_dependencies.yml
     with:
       branch: ${{ github.ref }}
diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml
index e7bbdc8..6b7f0a0 100644
--- a/.github/workflows/build_dependencies.yml
+++ b/.github/workflows/build_dependencies.yml
@@ -109,7 +109,7 @@ jobs:
       with:
         repository: eBay/sisl
         path: import/sisl
-        ref: master
+        ref: stable/v10.x
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
     - name: Load Sisl Cache
@@ -117,7 +117,7 @@ jobs:
       with:
         testing: 'False'
         path: import/sisl
-        key_prefix: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
+        key_prefix: Sisl10Deps-${{ 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 oss/master
+        conan export import/sisl
         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: SislDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
+        key_prefix: Sisl10Deps-${{ 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/.github/workflows/merge_build.yml b/.github/workflows/merge_build.yml
index 2841b72..af6a023 100644
--- a/.github/workflows/merge_build.yml
+++ b/.github/workflows/merge_build.yml
@@ -1,4 +1,4 @@
-name: IOManager Build
+name: IOManager Merge Build
 
 on:
   workflow_dispatch:
diff --git a/conanfile.py b/conanfile.py
index 96eae70..5ee49fc 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -54,7 +54,7 @@ def build_requirements(self):
         self.build_requires("cpr/1.10.4")
 
     def requirements(self):
-        self.requires("sisl/[~=11, include_prerelease=True]@oss/master")
+        self.requires("sisl/[>=10.3]")
 
         if self.options.grpc_support:
             self.requires("grpc/1.50.1")
diff --git a/src/lib/iomgr.cpp b/src/lib/iomgr.cpp
index 33ee94f..f9cb56a 100644
--- a/src/lib/iomgr.cpp
+++ b/src/lib/iomgr.cpp
@@ -69,7 +69,8 @@ SISL_OPTION_GROUP(iomgr,
                   (hdd_streams, "", "hdd_streams", "Number of streams for hdd - overridden value",
                    ::cxxopts::value< uint32_t >(), "count"))
 
-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
index ce806d2..9d24f82 100644
--- a/src/lib/spdk/iomgr_impl_spdk.cpp
+++ b/src/lib/spdk/iomgr_impl_spdk.cpp
@@ -25,7 +25,8 @@ extern "C" {
 #include <rte_malloc.h>
 }
 
-SISL_LOGGING_DEF(spdk)
+// SISL v11 change
+//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
index 9e5a7be..b6b9df8 100644
--- a/src/lib/watchdog.cpp
+++ b/src/lib/watchdog.cpp
@@ -3,7 +3,8 @@
 #include "watchdog.hpp"
 #include "iomgr_config.hpp"
 
-SISL_LOGGING_DEF(io_wd)
+// SISL v11 change
+//SISL_LOGGING_DEF(io_wd)
 
 namespace iomgr {
 IOWatchDog::IOWatchDog() {