Stable/v12.x (#276)

* v12.4.8 - Update workflows.

* Fix overrides

* Always build missing

Author: szmyd

.github/workflows/merge_build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - stable/v8.x
+      - stable/v12.x
       - master
 
 jobs:

.github/workflows/pr_build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - stable/v8.x
+      - stable/v12.x
       - master
 
 jobs:

.jenkins/Jenkinsfile

@@ -6,30 +6,10 @@ pipeline {
         CONAN_USER = 'oss'
         TARGET_BRANCH = 'master'
         STABLE_BRANCH = 'stable/v*'
+        BUILD_MISSING = "--build missing"
     }
 
     stages {
-        stage('Adjust for Master/PR') {
-            when { not {
-                branch "${STABLE_BRANCH}"
-            } }
-            steps {
-                script {
-                    BUILD_MISSING = "--build missing"
-                }
-            }
-        }
-        stage('Adjust for Testing/Stable') {
-            when {
-                branch "${STABLE_BRANCH}"
-            }
-            steps {
-                script {
-                    BUILD_MISSING = ""
-                }
-            }
-        }
-
         stage('Get Version') {
             steps {
                 script {

conanfile.py

@@ -9,7 +9,7 @@
 
 class SISLConan(ConanFile):
     name = "sisl"
-    version = "12.4.7"
+    version = "12.4.8"
 
     homepage = "https://github.com/eBay/sisl"
     description = "Library for fast data structures, utilities"
@@ -78,14 +78,15 @@ def build_requirements(self):
 
     def requirements(self):
         # Required
-        self.requires("boost/1.83.0", transitive_headers=True)
+        self.requires("boost/1.83.0", transitive_headers=True, override=True)
         self.requires("cxxopts/3.1.1", transitive_headers=True)
         self.requires("nlohmann_json/3.11.2", transitive_headers=True)
         self.requires("spdlog/1.12.0", transitive_headers=True)
         self.requires("zmarok-semver/1.1.0", transitive_headers=True)
         if self.settings.os in ["Linux"]:
             self.requires("breakpad/cci.20210521")
         self.requires("fmt/10.0.0",  override=True)
+        self.requires("lz4/1.10.0",  override=True)
 
         # ARM needs unreleased versionof libunwind
         if not self.settings.arch in ['x86', 'x86_64']:
@@ -97,7 +98,7 @@ def requirements(self):
             self.requires("flatbuffers/23.5.26", transitive_headers=True)
             self.requires("folly/nu2.2023.12.18.00", transitive_headers=True)
             self.requires("prometheus-cpp/1.1.0", transitive_headers=True)
-            self.requires("snappy/1.1.10", transitive_headers=True)
+            self.requires("snappy/[^1.1]", transitive_headers=True)
             self.requires("userspace-rcu/nu2.0.14.0", transitive_headers=True)
             self.requires("libcurl/8.4.0",  override=True)
             self.requires("xz_utils/5.4.5",  override=True)