Merge pull request eBay#206 from szmyd/merge_10_to_11

Merge 10 to 11

.github/workflows/merge_build.yml

@@ -5,7 +5,6 @@ on:
   push:
     branches:
       - stable/v8.x
-      - stable/v9.x
       - master
 
 jobs:

.github/workflows/pr_build.yml

@@ -5,7 +5,6 @@ on:
   pull_request:
     branches:
       - stable/v8.x
-      - stable/v9.x
       - master
 
 jobs:

.jenkins/Jenkinsfile

@@ -16,17 +16,13 @@ pipeline {
             steps {
                 script {
                     sh(script: "sed -Ei 's, version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*, version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
-                    BUILD_MISSING = "--build missing"
                 }
             }
         }
-        stage('Adjust for Testing/Stable') {
-            when {
-                branch "${STABLE_BRANCH}"
-            }
+        stage('include build missing') {
             steps {
                 script {
-                    BUILD_MISSING = ""
+                    BUILD_MISSING = "--build missing"
                 }
             }
         }
@@ -69,7 +65,7 @@ pipeline {
             }
             steps {
                 sh "conan user -r ebay-local -p ${ARTIFACTORY_PASS} _service_sds"
-                sh "conan upload ${PROJECT}/${TAG} -c --all -r ebay-local"
+                sh "conan upload ${PROJECT}/${TAG} --parallel -c --all -r ebay-local"
             }
         }
     }

conanfile.py

@@ -8,7 +8,7 @@
 
 class SISLConan(ConanFile):
     name = "sisl"
-    version = "11.0.3"
+    version = "11.0.4"
 
     homepage = "https://github.com/eBay/sisl"
     description = "Library for fast data structures, utilities"

include/sisl/logging/logging.h

@@ -31,6 +31,7 @@
 #include <string_view>
 #include <unordered_set>
 #include <vector>
+#include <filesystem>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/control/if.hpp>

src/file_watcher/file_watcher.cpp

@@ -119,9 +119,11 @@ bool FileWatcher::unregister_listener(const std::string& file_path, const std::s
 }
 
 bool FileWatcher::remove_watcher(FileInfo& file_info) {
-    if (auto err = inotify_rm_watch(m_inotify_fd, file_info.m_wd); err != 0) { return false; }
+    bool success = true;
+    if (auto err = inotify_rm_watch(m_inotify_fd, file_info.m_wd); err != 0) { success = false; }
+    // remove the file from the map regardless of the inotify_rm_watch result
     m_files.erase(file_info.m_filepath);
-    return true;
+    return success;
 }
 
 bool FileWatcher::stop() {