ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-15 08:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ximinez/lending-refactoring-2' into ximinez/lending-refactoring-3

Browse Source
This commit is contained in:
Ed Hennis
2025-08-21 11:39:05 -04:00
committed by GitHub
parent 422a99bb26 2d570267de
commit 0f1a2324bc
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/build-test/action.yml vendored
View File

@@ -75,7 +75,7 @@ runs:
echo 'Verifying presence of instrumentation.' echo 'Verifying presence of instrumentation.'
./rippled --version | grep libvoidstar ./rippled --version | grep libvoidstar
- name: Test the binary - name: Test the binary
if: ${{ inputs.build_only == 'true' }} if: ${{ inputs.build_only == 'false' }}
shell: bash shell: bash
working-directory: ${{ inputs.build_dir }}/${{ inputs.os == 'windows' && inputs.build_type || '' }} working-directory: ${{ inputs.build_dir }}/${{ inputs.os == 'windows' && inputs.build_type || '' }}
run: | run: |

13
.github/workflows/build-test.yml vendored
View File

@@ -88,6 +88,19 @@ jobs:
runs-on: ${{ matrix.architecture.runner }} runs-on: ${{ matrix.architecture.runner }}
container: ${{ inputs.os == 'linux' && format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version) || null }} container: ${{ inputs.os == 'linux' && format('ghcr.io/xrplf/ci/{0}-{1}:{2}-{3}', matrix.os.distro_name, matrix.os.distro_version, matrix.os.compiler_name, matrix.os.compiler_version) || null }}
steps: steps:
- name: Check strategy matrix
run: |
echo 'Operating system distro name: ${{ matrix.os.distro_name }}'
echo 'Operating system distro version: ${{ matrix.os.distro_version }}'
echo 'Operating system compiler name: ${{ matrix.os.compiler_name }}'
echo 'Operating system compiler version: ${{ matrix.os.compiler_version }}'
echo 'Architecture platform: ${{ matrix.architecture.platform }}'
echo 'Architecture runner: ${{ toJson(matrix.architecture.runner) }}'
echo 'Build type: ${{ matrix.build_type }}'
echo 'Build only: ${{ matrix.build_only }}'
echo 'CMake arguments: ${{ matrix.cmake_args }}'
echo 'CMake target: ${{ matrix.cmake_target }}'
echo 'Config name: ${{ matrix.config_name }}'
- name: Clean workspace (MacOS) - name: Clean workspace (MacOS)
if: ${{ inputs.os == 'macos' }} if: ${{ inputs.os == 'macos' }}
run: | run: |

17
cmake/RippledCompiler.cmake
View File

@@ -16,13 +16,16 @@ set(CMAKE_CXX_EXTENSIONS OFF)
target_compile_definitions (common target_compile_definitions (common
INTERFACE INTERFACE
$<$<CONFIG:Debug>:DEBUG _DEBUG> $<$<CONFIG:Debug>:DEBUG _DEBUG>
$<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>) #[===[
# ^^^^ NOTE: CMAKE release builds already have NDEBUG NOTE: CMAKE release builds already have NDEBUG defined, so no need to add it
# defined, so no need to add it explicitly except for explicitly except for the special case of (profile ON) and (assert OFF).
# this special case of (profile ON) and (assert OFF) Presumably this is because we don't want profile builds asserting unless
# -- presumably this is because we don't want profile asserts were specifically requested.
# builds asserting unless asserts were specifically ]===]
# requested $<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>
# TODO: Remove once we have migrated functions from OpenSSL 1.x to 3.x.
OPENSSL_SUPPRESS_DEPRECATED
)
if (MSVC) if (MSVC)
# remove existing exception flag since we set it to -EHa # remove existing exception flag since we set it to -EHa

2
conanfile.py
View File

@@ -27,7 +27,7 @@ class Xrpl(ConanFile):
'grpc/1.50.1', 'grpc/1.50.1',
'libarchive/3.8.1', 'libarchive/3.8.1',
'nudb/2.0.9', 'nudb/2.0.9',
'openssl/1.1.1w', 'openssl/3.5.2',
'soci/4.0.3', 'soci/4.0.3',
'zlib/1.3.1', 'zlib/1.3.1',
] ]