Skip to content

backport: bitcoin#23416,#18997,#18996, partial #27483 (TODO cleanup) #8121

backport: bitcoin#23416,#18997,#18996, partial #27483 (TODO cleanup)

backport: bitcoin#23416,#18997,#18996, partial #27483 (TODO cleanup) #8121

Triggered via pull request October 19, 2023 18:33
@knstknst
opened #5626
Status Failure
Total duration 44s
Artifacts
This run and associated checks have been archived and are scheduled for deletion. Learn more about checks retention

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 3 warnings
main
Process completed with exit code 1.
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 5626, 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/txmempool.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/qt/walletmodel.cpp' ] }, { number: 5513, files: [ 'ci/dash/build-docker.sh', 'ci/dash/build_depends.sh', 'ci/dash/build_src.sh', 'ci/dash/matrix.sh', 'ci/dash/push-docker.sh', 'ci/dash/test_integrationtests.sh', 'ci/dash/test_unittests.sh', 'contrib/auto_gdb/common_helpers.py', 'contrib/auto_gdb/dash_dbg.sh', 'contrib/auto_gdb/log_size.py', 'contrib/auto_gdb/simple_class_obj.py', 'contrib/auto_gdb/stl_containers.py', 'contrib/auto_gdb/used_size.py', 'contrib/containers/deploy/docker-entrypoint.sh', 'src/batchedlogger.cpp', 'src/batchedlogger.h', 'src/bench/bls_dkg.cpp', 'src/bench/ecdsa.cpp', 'src/bitcoin-cli.cpp', 'src/bls/bls.cpp', 'src/bls/bls.h', 'src/bls/bls_batchverifier.h', 'src/bls/bls_ies.cpp', 'src/bls/bls_worker.cpp', 'src/cachemap.h', 'src/cachemultimap.h', 'src/coinjoin/util.cpp', 'src/coinjoin/util.h', 'src/context.h', 'src/evo/cbtx.cpp', 'src/evo/cbtx.h', 'src/evo/deterministicmns.h', 'src/evo/dmnstate.cpp', 'src/evo/evodb.cpp', 'src/evo/evodb.h', 'src/evo/mnauth.h', 'src/evo/mnhftx.cpp', 'src/evo/mnhftx.h', 'src/evo/providertx.cpp', 'src/evo/providertx.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/evo/specialtx.cpp', 'src/evo/specialtx.h', 'src/evo/specialtxman.cpp', 'src/evo/specialtxman.h', 'src/flat-database.h', 'src/governance/classes.cpp', 'src/governance/classes.h', 'src/governance/governance.h', 'src/governance/object.h', 'src/governance/validators.cpp', 'src/governance/validators.h', 'src/governance/vote.h', 'src/hdchain.cpp', 'src/hdchain.h', 'src/llmq/blockprocessor.h', 'src/llmq/commitment.cpp', 'src/llmq/commitment.h', 'src/llmq/context.h', 'src/llmq/debug.cpp', 'src/llmq/debug.h', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionhandler.h', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/params.h', 'src/llmq/signing.cpp', 'src/llmq/signing.h', 'src/llmq/signing_shares.cpp', 'src/llmq/signing_shares.h', 'src/llmq/snapshot.cpp', 'src/llmq/snapshot.h', 'src/llmq/utils.h', 'src/masternode/meta.h', 'src/masternode/node.cpp', 'src/masternode/node.h', 'src/messagesigner.cpp', 'src/messagesigner.h', 'src/miner.cpp', 'src/netfulfilledman.cpp', 'src/netfulfilledman.h', 'src/qt/appearancewidget.cpp', 'src/qt/appearancewidget.h', 'src/qt/askpassphrasedialog.
main
Potential conflicts detected!