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
6 changed files with 15 additions and 11 deletions

View File

@@ -59,6 +59,7 @@ runs:
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-${{ inputs.main_branch }}
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ inputs.configuration }}-
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
${{ runner.os }}-ccache-v${{ inputs.cache_version }}-
- name: Configure project
shell: bash

View File

@@ -54,6 +54,7 @@ runs:
restore-keys: |
${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-${{ hashFiles('**/conanfile.txt', '**/conanfile.py') }}-
${{ runner.os }}-conan-v${{ inputs.cache_version }}-${{ inputs.compiler-id }}-
${{ runner.os }}-conan-v${{ inputs.cache_version }}-
- name: Export custom recipes
shell: bash

View File

@@ -22,14 +22,13 @@ jobs:
configuration: [Debug]
include:
- compiler: gcc
cc: gcc-13
cxx: g++-13
compiler_id: gcc-13
compiler_version: 13
cc: gcc-11
cxx: g++-11
compiler_id: gcc-11
env:
build_dir: .build
# Bump this number to invalidate all caches globally.
CACHE_VERSION: 2
CACHE_VERSION: 1
MAIN_BRANCH_NAME: dev
steps:
- name: Checkout
@@ -59,8 +58,12 @@ jobs:
conan profile update env.CXX=/usr/bin/${{ matrix.cxx }} default
conan profile update conf.tools.build:compiler_executables='{"c": "/usr/bin/${{ matrix.cc }}", "cpp": "/usr/bin/${{ matrix.cxx }}"}' default
# Set compiler version from matrix
conan profile update settings.compiler.version=${{ matrix.compiler_version }} default
# Set correct compiler version based on matrix.compiler
if [ "${{ matrix.compiler }}" = "gcc" ]; then
conan profile update settings.compiler.version=11 default
elif [ "${{ matrix.compiler }}" = "clang" ]; then
conan profile update settings.compiler.version=14 default
fi
# Display profile for verification
conan profile show default
@@ -117,4 +120,4 @@ jobs:
else
echo "Error: rippled executable not found in ${{ env.build_dir }}"
exit 1
fi
fi

View File

@@ -1,4 +1,3 @@
#include <cstdint>
#include <map>
#include <set>
#include <string>

View File

@@ -339,7 +339,7 @@ LedgerHistory::handleMismatch(
assert(builtLedger->info().seq == validLedger->info().seq);
if (auto stream = j_.error())
if (auto stream = j_.debug())
{
stream << "Built: " << getJson({*builtLedger, {}});
stream << "Valid: " << getJson({*validLedger, {}});

View File

@@ -321,7 +321,7 @@ public:
HSFEE,
ter(temMALFORMED));
env(ripple::test::jtx::hook(alice, std::vector<Json::Value>{}, 0),
env(ripple::test::jtx::hook(alice, {{}}, 0),
M("Must have a non-empty hooks field"),
HSFEE,
ter(temMALFORMED));