Merge branch 'develop' into ripple/smart-escrow

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

@@ -30,4 +30,4 @@ runs:
           --options:host '&:tests=True' \
           --options:host '&:xrpld=True' \
           --settings:all build_type=${{ inputs.build_type }} \
-          --format=json ..
+          ..

.github/scripts/strategy-matrix/generate.py

@@ -45,7 +45,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
         # Only generate a subset of configurations in PRs.
         if not all:
             # Debian:
-            # - Bookworm using GCC 13: Release and Unity on linux/arm64, set
+            # - Bookworm using GCC 13: Release and Unity on linux/amd64, set
             #   the reference fee to 500.
             # - Bookworm using GCC 15: Debug and no Unity on linux/amd64, enable
             #   code coverage (which will be done below).
@@ -57,7 +57,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
             if os['distro_name'] == 'debian':
                 skip = True
                 if os['distro_version'] == 'bookworm':
-                    if f'{os['compiler_name']}-{os['compiler_version']}' == 'gcc-13' and build_type == 'Release' and '-Dunity=ON' in cmake_args and architecture['platform'] == 'linux/arm64':
+                    if f'{os['compiler_name']}-{os['compiler_version']}' == 'gcc-13' and build_type == 'Release' and '-Dunity=ON' in cmake_args and architecture['platform'] == 'linux/amd64':
                         cmake_args = f'-DUNIT_TEST_REFERENCE_FEE=500 {cmake_args}'
                         skip = False
                     if f'{os['compiler_name']}-{os['compiler_version']}' == 'gcc-15' and build_type == 'Debug' and '-Dunity=OFF' in cmake_args and architecture['platform'] == 'linux/amd64':

.github/workflows/on-pr.yml

@@ -60,8 +60,10 @@ jobs:
             # Keep the paths below in sync with those in `on-trigger.yml`.
             .github/actions/build-deps/**
             .github/actions/build-test/**
+            .github/actions/setup-conan/**
             .github/scripts/strategy-matrix/**
             .github/workflows/build-test.yml
+            .github/workflows/reusable-strategy-matrix.yml
             .codecov.yml
             cmake/**
             conan/**

.github/workflows/on-trigger.yml

@@ -21,8 +21,10 @@ on:
       # Keep the paths below in sync with those in `on-pr.yml`.
       - ".github/actions/build-deps/**"
       - ".github/actions/build-test/**"
+      - ".github/actions/setup-conan/**"
       - ".github/scripts/strategy-matrix/**"
       - ".github/workflows/build-test.yml"
+      - ".github/workflows/reusable-strategy-matrix.yml"
       - ".codecov.yml"
       - "cmake/**"
       - "conan/**"

.github/workflows/upload-conan-deps.yml

@@ -2,7 +2,7 @@ name: Upload Conan Dependencies
 
 on:
   schedule:
-    - cron: "0 9 * * 1-5"
+    - cron: "0 3 * * 2-6"
   workflow_dispatch:
     inputs:
       force_source_build:
@@ -18,15 +18,8 @@ on:
   pull_request:
     branches: [develop]
     paths:
+      # This allows testing changes to the upload workflow in a PR
       - .github/workflows/upload-conan-deps.yml
-
-      - .github/workflows/reusable-strategy-matrix.yml
-
-      - .github/actions/build-deps/action.yml
-      - ".github/scripts/strategy-matrix/**"
-
-      - conanfile.py
-      - conan.lock
   push:
     branches: [develop]
     paths:
@@ -35,6 +28,7 @@ on:
       - .github/workflows/reusable-strategy-matrix.yml
 
       - .github/actions/build-deps/action.yml
+      - .github/actions/setup-conan/action.yml
       - ".github/scripts/strategy-matrix/**"
 
       - conanfile.py