From 56c1e078f2367da8d5c42b6ef1b7ffe0d0da6bec Mon Sep 17 00:00:00 2001
From: Bart <bthomee@users.noreply.github.com>
Date: Wed, 20 Aug 2025 19:25:40 -0400
Subject: [PATCH 1/2] fix: Correctly check for build_only when deciding whether
 to run tests (#5708)

This change modifies the `build_only` check used to determine whether to run tests. For easier debugging in the future it also prints out the contents of the strategy matrix.
---
 .github/actions/build-test/action.yml |  2 +-
 .github/workflows/build-test.yml      | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/actions/build-test/action.yml b/.github/actions/build-test/action.yml
index fc01d81091..44292e7318 100644
--- a/.github/actions/build-test/action.yml
+++ b/.github/actions/build-test/action.yml
@@ -75,7 +75,7 @@ runs:
         echo 'Verifying presence of instrumentation.'
         ./rippled --version | grep libvoidstar
     - name: Test the binary
-      if: ${{ inputs.build_only == 'true' }}
+      if: ${{ inputs.build_only == 'false' }}
       shell: bash
       working-directory: ${{ inputs.build_dir }}/${{ inputs.os == 'windows' && inputs.build_type || '' }}
       run: |
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index a330f5decb..2fa557f671 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -88,6 +88,19 @@ jobs:
     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 }}
     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)
         if: ${{ inputs.os == 'macos' }}
         run: |

From f847e3287cf50a6d31d6b31e8e7db3e57bf3aa8d Mon Sep 17 00:00:00 2001
From: Bart <bthomee@users.noreply.github.com>
Date: Thu, 21 Aug 2025 07:41:00 -0400
Subject: [PATCH 2/2] Update Conan dependencies: OpenSSL (#5617)

This change updates OpenSSL from 1.1.1w to 3.5.2. The code works as-is, but many functions have been marked as deprecated and thus will need to be rewritten. For now we explicitly add the `-DOPENSSL_SUPPRESS_DEPRECATED` to give us time to do so, while providing us with the benefits of the updated version.
---
 cmake/RippledCompiler.cmake | 17 ++++++++++-------
 conanfile.py                |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/cmake/RippledCompiler.cmake b/cmake/RippledCompiler.cmake
index bc3a62a48c..4d16222cbe 100644
--- a/cmake/RippledCompiler.cmake
+++ b/cmake/RippledCompiler.cmake
@@ -16,13 +16,16 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 target_compile_definitions (common
   INTERFACE
     $<$<CONFIG:Debug>:DEBUG _DEBUG>
-    $<$<AND:$<BOOL:${profile}>,$<NOT:$<BOOL:${assert}>>>:NDEBUG>)
-    # ^^^^ NOTE: CMAKE release builds already have NDEBUG
-    # defined, so no need to add it explicitly except for
-    # this special case of (profile ON) and (assert OFF)
-    # -- presumably this is because we don't want profile
-    # builds asserting unless asserts were specifically
-    # requested
+    #[===[
+    NOTE: CMAKE release builds already have NDEBUG defined, so no need to add it
+    explicitly except for the special case of (profile ON) and (assert OFF).
+    Presumably this is because we don't want profile 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)
   # remove existing exception flag since we set it to -EHa
diff --git a/conanfile.py b/conanfile.py
index ab4657277c..da99836157 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -27,7 +27,7 @@ class Xrpl(ConanFile):
         'grpc/1.50.1',
         'libarchive/3.8.1',
         'nudb/2.0.9',
-        'openssl/1.1.1w',
+        'openssl/3.5.2',
         'soci/4.0.3',
         'zlib/1.3.1',
     ]