From 1255ea7a0165da582a311da1572a491fca7ef3b8 Mon Sep 17 00:00:00 2001 From: Nicholas Dudfield Date: Wed, 30 Jul 2025 09:45:43 +0000 Subject: [PATCH] fix: gcc13 compile issues, fixes #557 --- .github/actions/xahau-ga-build/action.yml | 1 - .github/workflows/xahau-ga-nix.yml | 10 +++++----- src/ripple/app/hook/Enum.h | 1 + src/test/app/SetHook_test.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/xahau-ga-build/action.yml b/.github/actions/xahau-ga-build/action.yml index 4b9a637d5..417190472 100644 --- a/.github/actions/xahau-ga-build/action.yml +++ b/.github/actions/xahau-ga-build/action.yml @@ -59,7 +59,6 @@ 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 diff --git a/.github/workflows/xahau-ga-nix.yml b/.github/workflows/xahau-ga-nix.yml index 79a0f23ac..94a259679 100644 --- a/.github/workflows/xahau-ga-nix.yml +++ b/.github/workflows/xahau-ga-nix.yml @@ -22,9 +22,9 @@ jobs: configuration: [Debug] include: - compiler: gcc - cc: gcc-11 - cxx: g++-11 - compiler_id: gcc-11 + cc: gcc-13 + cxx: g++-13 + compiler_id: gcc-13 env: build_dir: .build # Bump this number to invalidate all caches globally. @@ -60,7 +60,7 @@ jobs: # Set correct compiler version based on matrix.compiler if [ "${{ matrix.compiler }}" = "gcc" ]; then - conan profile update settings.compiler.version=11 default + conan profile update settings.compiler.version=13 default elif [ "${{ matrix.compiler }}" = "clang" ]; then conan profile update settings.compiler.version=14 default fi @@ -120,4 +120,4 @@ jobs: else echo "Error: rippled executable not found in ${{ env.build_dir }}" exit 1 - fi \ No newline at end of file + fi diff --git a/src/ripple/app/hook/Enum.h b/src/ripple/app/hook/Enum.h index 2acf37183..19209389e 100644 --- a/src/ripple/app/hook/Enum.h +++ b/src/ripple/app/hook/Enum.h @@ -1,3 +1,4 @@ +#include #include #include #include diff --git a/src/test/app/SetHook_test.cpp b/src/test/app/SetHook_test.cpp index 6b441287a..c3b336d05 100644 --- a/src/test/app/SetHook_test.cpp +++ b/src/test/app/SetHook_test.cpp @@ -321,7 +321,7 @@ public: HSFEE, ter(temMALFORMED)); - env(ripple::test::jtx::hook(alice, {{}}, 0), + env(ripple::test::jtx::hook(alice, std::vector{}, 0), M("Must have a non-empty hooks field"), HSFEE, ter(temMALFORMED));