Skip to content

backport: Merge bitcoin/bitcoin#28815, 28931, 26679 #24696

backport: Merge bitcoin/bitcoin#28815, 28931, 26679

backport: Merge bitcoin/bitcoin#28815, 28931, 26679 #24696

Triggered via pull request March 26, 2026 20:42
@thepastaclawthepastaclaw
submitted #7092
Status Failure
Total duration 48s
Artifacts

predict-conflicts.yml

on: pull_request_review
predict_conflicts
44s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

1 error and 4 warnings
predict_conflicts
Resource not accessible by integration
predict_conflicts
Node.js 20 actions are deprecated. The following actions are running on Node.js 20 and may not work as expected: actions/checkout@v4, mshick/add-pr-comment@v2. Actions will be forced to run with Node.js 24 by default starting June 2nd, 2026. Please check if updated versions of these actions are available that support Node.js 24. To opt into Node.js 24 now, set the FORCE_JAVASCRIPT_ACTIONS_TO_NODE24=true environment variable on the runner or in your workflow file. Once Node.js 24 becomes the default, you can temporarily opt out by setting ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true. For more information see: https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
predict_conflicts
Potential conflicts detected!
predict_conflicts
{ pull_number: 7092, conflictPrs: [ { number: 6714, files: [ 'src/bench/coin_selection.cpp', 'src/bench/wallet_balance.cpp', 'src/bitcoin-wallet.cpp', 'src/bitcoind.cpp', 'src/chain.cpp', 'src/dummywallet.cpp', 'src/index/base.cpp', 'src/index/blockfilterindex.cpp', 'src/index/coinstatsindex.cpp', 'src/index/coinstatsindex.h', 'src/index/txindex.cpp', 'src/init.cpp', 'src/init.h', 'src/init/bitcoin-node.cpp', 'src/init/bitcoind.cpp', 'src/interfaces/chain.h', 'src/interfaces/init.h', 'src/interfaces/node.h', 'src/interfaces/wallet.h', 'src/net_processing.cpp', 'src/node/blockstorage.cpp', 'src/node/blockstorage.h', 'src/node/caches.cpp', 'src/node/caches.h', 'src/node/chainstate.cpp', 'src/node/chainstate.h', 'src/node/coin.cpp', 'src/node/coin.h', 'src/node/coinstats.cpp', 'src/node/coinstats.h', 'src/node/context.cpp', 'src/node/context.h', 'src/node/interfaces.cpp', 'src/node/miner.cpp', 'src/node/miner.h', 'src/node/minisketchwrapper.cpp', 'src/node/minisketchwrapper.h', 'src/node/psbt.cpp', 'src/node/psbt.h', 'src/node/transaction.cpp', 'src/node/transaction.h', 'src/node/utxo_snapshot.h', 'src/qt/bitcoin.cpp', 'src/qt/coincontroldialog.cpp', 'src/qt/coincontroldialog.h', 'src/qt/psbtoperationsdialog.cpp', 'src/qt/sendcoinsdialog.cpp', 'src/qt/sendcoinsdialog.h', 'src/qt/test/addressbooktests.cpp', 'src/qt/test/test_main.cpp', 'src/qt/test/wallettests.cpp', 'src/qt/transactiondesc.cpp', 'src/qt/transactionrecord.cpp', 'src/qt/walletcontroller.cpp', 'src/qt/walletmodel.cpp', 'src/qt/walletmodel.h', 'src/rest.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/blockchain.h', 'src/rpc/mining.cpp', 'src/rpc/misc.cpp', 'src/rpc/net.cpp', 'src/rpc/rawtransaction.cpp', 'src/rpc/server_util.cpp', 'src/rpc/server_util.h', 'src/test/blockfilter_index_tests.cpp', 'src/test/coinstatsindex_tests.cpp', 'src/test/fuzz/coins_view.cpp', 'src/test/fuzz/deserialize.cpp', 'src/test/fuzz/minisketch.cpp', 'src/test/fuzz/psbt.cpp', 'src/test/fuzz/tx_pool.cpp', 'src/test/fuzz/utxo_snapshot.cpp', 'src/test/miner_tests.cpp', 'src/test/minisketch_tests.cpp', 'src/test/util/blockfilter.cpp', 'src/test/util/chainstate.h', 'src/test/util/mining.cpp', 'src/test/util/mining.h', 'src/test/util/setup_common.cpp', 'src/test/util/setup_common.h', 'src/test/util/wallet.cpp', 'src/test/util/wallet.h', 'src/test/validation_block_tests.cpp', 'src/test/validation_chainstatemanager_tests.cpp', 'src/test/validation_flush_tests.cpp', 'src/validation.cpp', 'src/validation.h', 'src/wallet/bdb.cpp', 'src/wallet/bdb.h', 'src/wallet/coincontrol.cpp', 'src/wallet/coincontrol.h', 'src/wallet/coinselection.cpp', 'src/wallet/coinselection.h', 'src/wallet/context.cpp', 'src/wallet/context.h', 'src/wallet/crypter.cpp', 'src/wallet/crypter.h', 'src/wallet/db.cpp', 'src/wallet/db.h' ], conflicts: [ 'src/test/fuzz/coins_view.cpp' ] }, { number: 3362, files: [ 'src/qt/transactiontablemodel.cpp', 'src/qt/transactiontablemodel.h', 'src/qt/walletmodel.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ], conflicts: [ 'src/wallet/wallet.cpp' ] }, { number: 5860, files: [ 'src/Makefile.test.include', 'src/bench/verify_script.cpp', 'src/chainparams.cpp',
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']