Merge pull request #49 from raakella1/sisl_update

unconditionally include build missing option
eBay · Aug 30, 2023 · b43ed01 · b43ed01
2 parents 75dfdf7 + e143f16
commit b43ed01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
@@ -25,19 +25,14 @@ pipeline {
             steps {
                 script {
                     sh(script: "sed -Ei 's,version = .*\"([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+).*,version = \"\\1-${env.BUILD_NUMBER}\",' conanfile.py")
-                    BUILD_MISSING = "--build missing"
                     LAST_COMMITS = sh(script: "git log -n 2 --pretty=short", returnStdout: true)
                 }
             }
         }
-        stage('Adjust for Testing/Stable') {
-            when { anyOf {
-                branch "${TESTING_BRANCH}"
-                branch "${STABLE_BRANCH}"
-            } }
+        stage('Include build missing') {
             steps {
                 script {
-                    BUILD_MISSING = ""
+                    BUILD_MISSING = "--build missing"
                 }
             }
         }

diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@
 
 class IOMgrConan(ConanFile):
     name = "iomgr"
-    version = "8.7.4"
+    version = "8.7.5"
     homepage = "https://github.com/eBay/IOManager"
     description = "Asynchronous event manager"
     topics = ("ebay", "nublox", "aio")
@@ -58,11 +58,11 @@ def requirements(self):
         self.requires("spdk/21.07.y")
         self.requires("pistache/0.0.5")
         self.requires("zmarok-semver/1.1.0")
+        self.requires("libcurl/7.86.0")
 
         self.requires("flatbuffers/1.12.0", override=True)
         self.requires("openssl/1.1.1q", override=True)
         self.requires("zlib/1.2.12", override=True)
-        self.requires("libcurl/7.80.0", override=True)
 
     def build(self):
         cmake = CMake(self)