Compare commits

...

3 Commits

Author SHA1 Message Date
Nicholas Dudfield
9889daec38 fix: use correct namespace for conan exports in release builder 2025-08-14 10:22:43 +07:00
RichardAH
bac0c6297b Merge branch 'dev' into sublimator-patch-4 2025-08-14 13:15:21 +10:00
Niq Dudfield
90bb986316 fix(dependencies): export correct and namespaced deps versions 2025-07-16 12:55:57 +07:00
4 changed files with 9 additions and 9 deletions

View File

@@ -59,8 +59,8 @@ runs:
- name: Export custom recipes - name: Export custom recipes
shell: bash shell: bash
run: | run: |
conan export external/snappy snappy/1.1.9@ conan export external/snappy snappy/1.1.10@xahaud/stable
conan export external/soci soci/4.0.3@ conan export external/soci soci/4.0.3@xahaud/stable
- name: Install dependencies - name: Install dependencies
shell: bash shell: bash
@@ -83,4 +83,4 @@ runs:
path: | path: |
~/.conan ~/.conan
~/.conan2 ~/.conan2
key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }} key: ${{ steps.cache-restore-conan.outputs.cache-primary-key }}

View File

@@ -117,14 +117,14 @@ can't build earlier Boost versions.
which allows you to statically link it with GCC, if you want. 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). 5. Export our [Conan recipe for SOCI](./external/soci).
It patches their CMake to correctly import its dependencies. 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 ### Build and Test

View File

@@ -43,8 +43,8 @@ export LDFLAGS="-static-libstdc++"
git config --global --add safe.directory /io && git config --global --add safe.directory /io &&
git checkout src/ripple/protocol/impl/BuildInfo.cpp && git checkout src/ripple/protocol/impl/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/ripple/protocol/impl/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/ripple/protocol/impl/BuildInfo.cpp &&
conan export external/snappy snappy/1.1.10@ && conan export external/snappy snappy/1.1.10@xahaud/stable &&
conan export external/soci soci/4.0.3@ && conan export external/soci soci/4.0.3@xahaud/stable &&
cd release-build && cd release-build &&
conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE && conan install .. --output-folder . --build missing --settings build_type=$BUILD_TYPE &&
cmake .. -G Ninja \ cmake .. -G Ninja \

View File

@@ -32,8 +32,8 @@ class Xrpl(ConanFile):
'nudb/2.0.8', 'nudb/2.0.8',
'openssl/1.1.1u', 'openssl/1.1.1u',
'protobuf/3.21.9', 'protobuf/3.21.9',
'snappy/1.1.10', 'snappy/1.1.10@xahaud/stable',
'soci/4.0.3', 'soci/4.0.3@xahaud/stable',
'sqlite3/3.42.0', 'sqlite3/3.42.0',
'zlib/1.2.13', 'zlib/1.2.13',
'wasmedge/0.11.2', 'wasmedge/0.11.2',