Remove copy of date, fix libcurl directly.

eBay · Jan 24, 2024 · c1a5cfb · c1a5cfb
1 parent 537e8de
commit c1a5cfb
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 249 deletions.
diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml
@@ -106,7 +106,6 @@ jobs:
         conan export 3rd_party/jemalloc
         conan export 3rd_party/prerelease_dummy
         conan export 3rd_party/pistache pistache/cci.20201127@
-        conan export 3rd_party/date date/3.0.1@
         cached_pkgs=$(ls -1d ~/.conan/data/*/*/*/*/export 2>/dev/null | 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' }}

diff --git a/3rd_party/date/conandata.yml b/3rd_party/date/conandata.yml
diff --git a/3rd_party/date/conanfile.py b/3rd_party/date/conanfile.py
diff --git a/3rd_party/date/patches/0001-fix-uwp.patch b/3rd_party/date/patches/0001-fix-uwp.patch
diff --git a/3rd_party/date/patches/cmake-3.0.0.patch b/3rd_party/date/patches/cmake-3.0.0.patch
diff --git a/3rd_party/date/patches/cmake-3.0.1.patch b/3rd_party/date/patches/cmake-3.0.1.patch
diff --git a/3rd_party/date/patches/cmake.patch b/3rd_party/date/patches/cmake.patch
diff --git a/3rd_party/date/patches/string_view.patch b/3rd_party/date/patches/string_view.patch
diff --git a/conanfile.py b/conanfile.py
@@ -8,7 +8,7 @@
 
 class SISLConan(ConanFile):
     name = "sisl"
-    version = "8.6.6"
+    version = "8.6.7"
     homepage = "https://github.com/eBay/sisl"
     description = "Library for fast data structures, utilities"
     topics = ("ebay", "components", "core", "efficiency")
@@ -68,7 +68,7 @@ def requirements(self):
         self.requires("fmt/8.1.1",          override=True)
         self.requires("libevent/2.1.12",    override=True)
         self.requires("openssl/1.1.1s",     override=True)
-        self.requires("libcurl/7.86.0")
+        self.requires("libcurl/8.4.0",      override=True)
         self.requires("xz_utils/5.2.5",     override=True)
         self.requires("zlib/1.2.12",        override=True)
         if self.options.malloc_impl == "jemalloc":