diff --git a/.github/actions/xahau-ga-dependencies/action.yml b/.github/actions/xahau-ga-dependencies/action.yml index 0340e937e..ae038425c 100644 --- a/.github/actions/xahau-ga-dependencies/action.yml +++ b/.github/actions/xahau-ga-dependencies/action.yml @@ -59,8 +59,8 @@ runs: - name: Export custom recipes shell: bash run: | - conan export external/snappy snappy/1.1.9@ - conan export external/soci soci/4.0.3@ + conan export external/snappy snappy/1.1.10@xahaud/stable + conan export external/soci soci/4.0.3@xahaud/stable - name: Install dependencies shell: bash @@ -83,4 +83,4 @@ runs: path: | ~/.conan ~/.conan2 - key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }} \ No newline at end of file + key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }} diff --git a/BUILD.md b/BUILD.md index 0c62fb1ef..21f46bef5 100644 --- a/BUILD.md +++ b/BUILD.md @@ -117,14 +117,14 @@ can't build earlier Boost versions. which allows you to statically link it with GCC, if you want. ``` - conan export external/snappy snappy/1.1.9@ + conan export external/snappy snappy/1.1.10@xahaud/stable ``` 5. Export our [Conan recipe for SOCI](./external/soci). It patches their CMake to correctly import its dependencies. ``` - conan export external/soci soci/4.0.3@ + conan export external/soci soci/4.0.3@xahaud/stable ``` ### Build and Test diff --git a/conanfile.py b/conanfile.py index 9dea082ff..0a5bc0b4a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -32,8 +32,8 @@ class Xrpl(ConanFile): 'nudb/2.0.8', 'openssl/1.1.1u', 'protobuf/3.21.9', - 'snappy/1.1.10', - 'soci/4.0.3', + 'snappy/1.1.10@xahaud/stable', + 'soci/4.0.3@xahaud/stable', 'sqlite3/3.42.0', 'zlib/1.2.13', 'wasmedge/0.11.2', diff --git a/external/soci/conanfile.py b/external/soci/conanfile.py index 67c572d5a..06497516a 100644 --- a/external/soci/conanfile.py +++ b/external/soci/conanfile.py @@ -154,7 +154,7 @@ class SociConan(ConanFile): self.cpp_info.components["soci_core"].set_property("cmake_target_name", "SOCI::soci_core{}".format(target_suffix)) self.cpp_info.components["soci_core"].libs = ["{}soci_core{}".format(lib_prefix, lib_suffix)] if self.options.with_boost: - self.cpp_info.components["soci_core"].requires.append("boost::boost") + self.cpp_info.components["soci_core"].requires.append("boost::headers") # soci_empty if self.options.empty: