Skip to content

Commit 13b94fb

Browse files
authored
Merge branch 'develop' into copilot/fix-5adea215-d850-4ab8-a595-b04e63e948a6
2 parents 1c3b481 + f847e32 commit 13b94fb

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

.github/actions/build-test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ runs:
7575
echo 'Verifying presence of instrumentation.'
7676
./rippled --version | grep libvoidstar
7777
- name: Test the binary
78-
if: ${{ inputs.build_only == 'true' }}
78+
if: ${{ inputs.build_only == 'false' }}
7979
shell: bash
8080
working-directory: ${{ inputs.build_dir }}/${{ inputs.os == 'windows' && inputs.build_type || '' }}
8181
run: |

.github/workflows/build-test.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,19 @@ jobs:
8888
runs-on: ${{ matrix.architecture.runner }}
8989
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 }}
9090
steps:
91+
- name: Check strategy matrix
92+
run: |
93+
echo 'Operating system distro name: ${{ matrix.os.distro_name }}'
94+
echo 'Operating system distro version: ${{ matrix.os.distro_version }}'
95+
echo 'Operating system compiler name: ${{ matrix.os.compiler_name }}'
96+
echo 'Operating system compiler version: ${{ matrix.os.compiler_version }}'
97+
echo 'Architecture platform: ${{ matrix.architecture.platform }}'
98+
echo 'Architecture runner: ${{ toJson(matrix.architecture.runner) }}'
99+
echo 'Build type: ${{ matrix.build_type }}'
100+
echo 'Build only: ${{ matrix.build_only }}'
101+
echo 'CMake arguments: ${{ matrix.cmake_args }}'
102+
echo 'CMake target: ${{ matrix.cmake_target }}'
103+
echo 'Config name: ${{ matrix.config_name }}'
91104
- name: Clean workspace (MacOS)
92105
if: ${{ inputs.os == 'macos' }}
93106
run: |

cmake/RippledCompiler.cmake

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1616
target_compile_definitions (common
1717
INTERFACE
1818
$<$<CONFIG:Debug>:DEBUG _DEBUG>
19-
$<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>)
20-
# ^^^^ NOTE: CMAKE release builds already have NDEBUG
21-
# defined, so no need to add it explicitly except for
22-
# this special case of (profile ON) and (assert OFF)
23-
# -- presumably this is because we don't want profile
24-
# builds asserting unless asserts were specifically
25-
# requested
19+
#[===[
20+
NOTE: CMAKE release builds already have NDEBUG defined, so no need to add it
21+
explicitly except for the special case of (profile ON) and (assert OFF).
22+
Presumably this is because we don't want profile builds asserting unless
23+
asserts were specifically requested.
24+
]===]
25+
$<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>
26+
# TODO: Remove once we have migrated functions from OpenSSL 1.x to 3.x.
27+
OPENSSL_SUPPRESS_DEPRECATED
28+
)
2629

2730
if (MSVC)
2831
# remove existing exception flag since we set it to -EHa

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Xrpl(ConanFile):
2727
'grpc/1.50.1',
2828
'libarchive/3.8.1',
2929
'nudb/2.0.9',
30-
'openssl/1.1.1w',
30+
'openssl/3.5.2',
3131
'soci/4.0.3',
3232
'zlib/1.3.1',
3333
]

0 commit comments

Comments
 (0)