From 24c43a261754d1c1f7558d241e459ac432e49dde Mon Sep 17 00:00:00 2001 From: Sergey Kuznetsov Date: Thu, 2 Apr 2026 16:35:45 +0100 Subject: [PATCH 1/2] Fix build --- src/test/app/MPToken_test.cpp | 50 ++++++++++++++++------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/src/test/app/MPToken_test.cpp b/src/test/app/MPToken_test.cpp index 481a4bd234..2870248af8 100644 --- a/src/test/app/MPToken_test.cpp +++ b/src/test/app/MPToken_test.cpp @@ -3653,34 +3653,30 @@ class MPToken_test : public beast::unit_test::suite // Each test case creates a fresh ApplyView and calls // accountSendMulti from the issuer to the given receivers. - auto const runTest = - [&](MultiplePaymentDestinations const& receivers, - TER expectedTer, - std::optional expectedOutstanding, - std::string const& label) { - ApplyViewImpl av(&*env.current(), tapNONE); - auto const ter = accountSendMulti( - av, - issuer.id(), - asset, - receivers, - env.app().getJournal("View")); - BEAST_EXPECTS(ter == expectedTer, label); + auto const runTest = [&](MultiplePaymentDestinations const& receivers, + TER expectedTer, + std::optional + expectedOutstanding, + std::string const& label) { + ApplyViewImpl av(&*env.current(), tapNONE); + auto const ter = accountSendMulti( + av, issuer.id(), asset, receivers, env.app().journal("View")); + BEAST_EXPECTS(ter == expectedTer, label); - // Only verify OutstandingAmount on success — on error the - // view may contain partial state and must be discarded. - if (expectedOutstanding) - { - auto const sle = - av.peek(keylet::mptIssuance(mptt.issuanceID())); - if (!BEAST_EXPECT(sle)) - return; - BEAST_EXPECTS( - sle->getFieldU64(sfOutstandingAmount) == - *expectedOutstanding, - label); - } - }; + // Only verify OutstandingAmount on success — on error the + // view may contain partial state and must be discarded. + if (expectedOutstanding) + { + auto const sle = + av.peek(keylet::mptIssuance(mptt.issuanceID())); + if (!BEAST_EXPECT(sle)) + return; + BEAST_EXPECTS( + sle->getFieldU64(sfOutstandingAmount) == + *expectedOutstanding, + label); + } + }; using R = MultiplePaymentDestinations; From 628230a63375c96154c4908399ffb64daa3d77cc Mon Sep 17 00:00:00 2001 From: Bart Date: Wed, 11 Mar 2026 11:48:40 +0100 Subject: [PATCH 2/2] ci: Only upload artifacts in the XRPLF/rippled repository (#6523) This change will only attempt to upload artifacts for CI runs performed in the XRPLF/rippled repository. --- .github/workflows/on-pr.yml | 3 ++- .github/workflows/reusable-build-test-config.yml | 4 ++-- .github/workflows/upload-conan-deps.yml | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml index ae996fc183..2d2d5df844 100644 --- a/.github/workflows/on-pr.yml +++ b/.github/workflows/on-pr.yml @@ -115,7 +115,8 @@ jobs: needs: - should-run - build-test - if: ${{ needs.should-run.outputs.go == 'true' && (startsWith(github.base_ref, 'release') || github.base_ref == 'master') }} + # Only run when committing to a PR that targets a release branch or master. + if: ${{ github.repository == 'XRPLF/rippled' && needs.should-run.outputs.go == 'true' && (startsWith(github.base_ref, 'release') || github.base_ref == 'master') }} uses: ./.github/workflows/reusable-notify-clio.yml secrets: clio_notify_token: ${{ secrets.CLIO_NOTIFY_TOKEN }} diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml index e1024e31ee..0c0d0bf4aa 100644 --- a/.github/workflows/reusable-build-test-config.yml +++ b/.github/workflows/reusable-build-test-config.yml @@ -130,7 +130,7 @@ jobs: --target "${CMAKE_TARGET}" - name: Upload rippled artifact (Linux) - if: ${{ github.repository_owner == 'XRPLF' && runner.os == 'Linux' }} + if: ${{ github.repository == 'XRPLF/rippled' && runner.os == 'Linux' }} uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 env: BUILD_DIR: ${{ inputs.build_dir }} @@ -201,7 +201,7 @@ jobs: --target coverage - name: Upload coverage report - if: ${{ github.repository_owner == 'XRPLF' && !inputs.build_only && env.ENABLED_COVERAGE == 'true' }} + if: ${{ github.repository == 'XRPLF/rippled' && !inputs.build_only && env.ENABLED_COVERAGE == 'true' }} uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3 with: disable_search: true diff --git a/.github/workflows/upload-conan-deps.yml b/.github/workflows/upload-conan-deps.yml index 4917812274..9cae6266d8 100644 --- a/.github/workflows/upload-conan-deps.yml +++ b/.github/workflows/upload-conan-deps.yml @@ -101,11 +101,11 @@ jobs: log_verbosity: ${{ runner.os == 'Windows' && 'quiet' || 'verbose' }} - name: Log into Conan remote - if: ${{ github.repository_owner == 'XRPLF' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} + if: ${{ github.repository == 'XRPLF/rippled' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} run: conan remote login "${CONAN_REMOTE_NAME}" "${{ secrets.CONAN_REMOTE_USERNAME }}" --password "${{ secrets.CONAN_REMOTE_PASSWORD }}" - name: Upload Conan packages - if: ${{ github.repository_owner == 'XRPLF' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} + if: ${{ github.repository == 'XRPLF/rippled' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} env: FORCE_OPTION: ${{ github.event.inputs.force_upload == 'true' && '--force' || '' }} run: conan upload "*" --remote="${CONAN_REMOTE_NAME}" --confirm ${FORCE_OPTION}