Skip to content

backport: bitcoin#25383, 25535, 25337 #17364

backport: bitcoin#25383, 25535, 25337

backport: bitcoin#25383, 25535, 25337 #17364

Triggered via pull request March 9, 2025 03:14
@vijaydasmpvijaydasmp
synchronize #6524
Status Failure
Total duration 44s
Artifacts

predict-conflicts.yml

on: pull_request_target
predict_conflicts
34s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

1 error and 3 warnings
predict_conflicts
Process completed with exit code 1.
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
predict_conflicts
{ pull_number: 6524, conflictPrs: [ { number: 4686, files: [ 'configure.ac', 'depends/Makefile', 'depends/packages/packages.mk', 'depends/packages/qt.mk', 'src/bench/block_assemble.cpp', 'src/chainparams.cpp', 'src/chainparams.h', 'src/consensus/consensus.h', 'src/consensus/params.h', 'src/consensus/tx_verify.cpp', 'src/qt/paymentserver.cpp', 'src/qt/test/test_main.cpp', 'src/qt/transactiondesc.cpp', 'src/random.cpp', 'src/rpc/misc.cpp', 'src/txmempool.cpp', 'src/wallet/wallet.cpp', 'test/functional/feature_llmq_chainlocks.py', 'test/functional/test_framework/test_framework.py' ], conflicts: [ 'src/wallet/wallet.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', 'src/wallet/wallet.h' ] }, { number: 6182, files: [ 'src/governance/common.cpp', 'src/governance/common.h', 'src/governance/governance.cpp', 'src/governance/object.cpp', 'src/governance/object.h', 'src/interfaces/node.h', 'src/rpc/governance.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/feature_governance.py', 'test/functional/feature_governance_cl.py', 'test/functional/feature_governance_objects.py', 'test/functional/interface_zmq_dash.py', 'test/functional/test_framework/governance.py', 'test/functional/test_framework/messages.py' ], conflicts: [ 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ] }, { number: 6258, files: [ 'src/bitcoin-wallet.cpp', 'src/qt/forms/createwalletdialog.ui', 'src/wallet/rpcwallet.cpp', 'src/wallet/wallettool.cpp', 'test/functional/tool_wallet.py' ], conflicts: [ 'src/wallet/rpcwallet.cpp' ] }, { number: 6307, files: [ 'src/interfaces/chain.h', 'src/interfaces/wallet.h', 'src/node/interfaces.cpp', 'src/qt/transactiondesc.cpp', 'src/qt/transactionrecord.cpp', 'src/qt/transactionrecord.h', 'src/qt/transactiontablemodel.cpp', 'src/wallet/interfaces.cpp', 'src/wallet/receive.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/spend.cpp', 'test/functional/test_runner.py', 'test/functional/wallet_timelock.py' ], conflicts: [ 'src/interfaces/wallet.h', 'src/wallet/interfaces.cpp', 'src/wallet/rpcwallet.cpp' ] }, { number: 6595, files: [ 'configure.ac', 'src/init.cpp', 'src/net_processing.cpp', 'src/qt/test/wallettests.cpp', 'src/rest.cpp', 'src/test/interfaces_tests.cpp', 'src/test/validation_block_tests.cpp', 'src/test/validation_chainstatemanager_tests.cpp', 'src/txorphanage.cpp', 'src/txorphanage.h', 'src/validation.h', 'src/wallet/rpcwallet.cpp', 'src/wallet/test/spend_tests.cpp', 'src/wallet/test/wallet_tests.cpp' ], conflicts: [ 'src/wallet/rpcwallet.cpp' ] }, { number: 6019, files: [ 'ci/test/00_setup_env_arm.sh', 'ci/test/00_setup_env_mac.sh', 'ci/test/00_setup_env_mac_host.sh', 'ci/test/00_setup_env_native_asan.sh', 'ci/test/00_setup_env_native_fuzz.sh', 'ci/test/00_setup_env_native_multiprocess.sh', 'ci/test/00_setup_env_native_nowallet.sh', 'ci/test/00_setup_env_native_qt5.sh', 'ci/test/00_setup_env_native_tsan.sh', 'ci/test/00_setup_env_s390x.sh', 'ci/test/00_setup_env_win64.sh', 'configure.ac', 'doc/Doxyfile.in', 'doc/build-openbsd.md',
predict_conflicts
Potential conflicts detected!