Merge remote-tracking branch 'upstream/dev' into sync-2.4.0

.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.10@
-        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

BUILD.md

@@ -168,7 +168,7 @@ which allows you to statically link it with GCC, if you want.
 
    ```
    # Conan 1.x
-   conan export external/snappy snappy/1.1.10@
+   conan export external/snappy snappy/1.1.10@xahaud/stable
    # Conan 2.x
    conan export --version 1.1.10 external/snappy
    ```
@@ -188,7 +188,7 @@ It patches their CMake to correctly import its dependencies.
 
    ```
    # Conan 1.x
-   conan export external/soci soci/4.0.3@
+   conan export external/soci soci/4.0.3@xahaud/stable
    # Conan 2.x
    conan export --version 4.0.3 external/soci
    ```

build-core.sh

@@ -45,8 +45,8 @@ export CMAKE_STATIC_LINKER_FLAGS="-static-libstdc++"
 git config --global --add safe.directory /io &&
 git checkout src/libxrpl/protocol/BuildInfo.cpp &&
 sed -i s/\"0.0.0\"/\"$(date +%Y).$(date +%-m).$(date +%-d)-$(git rev-parse --abbrev-ref HEAD)$(if [ -n "$4" ]; then echo "+$4"; fi)\"/g src/libxrpl/protocol/BuildInfo.cpp &&
-conan export external/snappy snappy/1.1.10@ &&
-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 &&
 cd release-build &&
 conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE &&
 cmake .. -G Ninja \

conanfile.py

@@ -29,7 +29,7 @@ class Xrpl(ConanFile):
         'libarchive/3.7.6',
         'nudb/2.0.8',
         'openssl/1.1.1v',
-        'soci/4.0.3',
+        'soci/4.0.3@xahaud/stable',
         'xxhash/0.8.2',
         'wasmedge/0.11.2',
         'zlib/1.3.1',