From fdd215fc9621afcc945208cc551eb28c67fba2a6 Mon Sep 17 00:00:00 2001
From: Brian Szmyd <bszmyd@ebay.com>
Date: Wed, 29 Oct 2025 08:13:02 -0700
Subject: [PATCH 1/4] v12.4.8 - Update workflows.

---
 .github/workflows/merge_build.yml | 2 +-
 .github/workflows/pr_build.yml    | 2 +-
 conanfile.py                      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/merge_build.yml b/.github/workflows/merge_build.yml
index 4aa16cff..729f88d1 100644
--- a/.github/workflows/merge_build.yml
+++ b/.github/workflows/merge_build.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - stable/v8.x
+      - stable/v12.x
       - master
 
 jobs:
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 41417546..e8c5fe24 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     branches:
-      - stable/v8.x
+      - stable/v12.x
       - master
 
 jobs:
diff --git a/conanfile.py b/conanfile.py
index 9befe8cf..1f47a9e9 100644
--- a/conanfile.py
+++ b/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,7 +78,7 @@ 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)

From 01b7e5b3505cea4f6160321517839527e2ba0a7c Mon Sep 17 00:00:00 2001
From: Brian Szmyd <bszmyd@ebay.com>
Date: Wed, 29 Oct 2025 08:20:55 -0700
Subject: [PATCH 2/4] Fix overrides

---
 conanfile.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conanfile.py b/conanfile.py
index 1f47a9e9..473317c1 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -86,6 +86,7 @@ def requirements(self):
         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)

From 09ddbc2781d303703c6e910b98636ba49e123ed8 Mon Sep 17 00:00:00 2001
From: Brian Szmyd <bszmyd@ebay.com>
Date: Wed, 29 Oct 2025 08:25:27 -0700
Subject: [PATCH 3/4] Always build missing

---
 .jenkins/Jenkinsfile | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
index d9dfffdf..2c4d3aca 100644
--- a/.jenkins/Jenkinsfile
+++ b/.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 {

From d8d4a78178899872279fafa95e90b5b575e12d5b Mon Sep 17 00:00:00 2001
From: Brian Szmyd <bszmyd@ebay.com>
Date: Wed, 29 Oct 2025 08:44:24 -0700
Subject: [PATCH 4/4] Use boost 1.85

---
 conanfile.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conanfile.py b/conanfile.py
index 473317c1..6f171704 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -78,7 +78,7 @@ def build_requirements(self):
 
     def requirements(self):
         # Required
-        self.requires("boost/1.83.0", transitive_headers=True, override=True)
+        self.requires("boost/1.85.0", transitive_headers=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)