backport: bitcoin#24322, #25064, #25065, #25168, #25281, #25290, #25307, #25487, #25607, #26003 (kernel backports) #26960
Annotations
2 errors and 3 warnings
|
Fail if conflicts exist
Process completed with exit code 1.
|
|
validate potential conflicts
Process completed with exit code 1.
|
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7361,
conflictPrs: [
{
number: 5943,
files: [
'src/Makefile.am',
'src/Makefile.test.include',
'src/governance/governance.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/signing.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/protocol.h',
'src/spork.cpp',
'src/spork.h',
'src/test/fuzz/txrequest.cpp',
'src/test/txrequest_tests.cpp',
'src/txrequest.cpp',
'src/txrequest.h',
'test/functional/p2p_tx_download.py'
],
conflicts: [
'src/Makefile.am',
'src/net_processing.cpp',
'src/net_processing.h'
]
},
{
number: 6453,
files: [
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/commitment.cpp',
'src/llmq/debug.cpp',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/dkgsessionmgr.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/quorums.cpp',
'src/node/blockstorage.cpp',
'src/node/blockstorage.h',
'src/rpc/quorums.cpp',
'src/validation.cpp'
],
conflicts: [
'src/node/blockstorage.cpp',
'src/node/blockstorage.h',
'src/validation.cpp'
]
},
{
number: 6493,
files: [
'src/bls/bls.h',
'src/bls/bls_ies.cpp',
'src/bls/bls_ies.h',
'src/coinjoin/coinjoin.cpp',
'src/coinjoin/coinjoin.h',
'src/serialize.h'
],
conflicts: [ 'src/bls/bls.h' ]
},
{
number: 6904,
files: [
'ci/dash/lint-tidy.sh',
'doc/REST-interface.md',
'doc/release-notes-6888.md',
'src/Makefile.am',
'src/bench/duplicate_inputs.cpp',
'src/bitcoind.cpp',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/coinjoin/client.cpp',
'src/deploymentstatus.cpp',
'src/deploymentstatus.h',
'src/evo/creditpool.cpp',
'src/evo/creditpool.h',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/mnhftx.cpp',
'src/evo/mnhftx.h',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/smldiff.cpp',
'src/evo/specialtxman.cpp',
'src/governance/classes.cpp',
'src/governance/governance.cpp',
'src/index/base.cpp',
'src/index/base.h',
'src/index/blockfilterindex.cpp',
'src/index/blockfilterindex.h',
'src/index/coinstatsindex.cpp',
'src/index/coinstatsindex.h',
'src/index/txindex.cpp',
'src/index/txindex.h',
'src/init.cpp',
'src/init.h',
'src/init/common.cpp',
'src/init/common.h',
'src/interfaces/chain.h',
'src/interfaces/node.h',
'src/kernel/chain.cpp',
'src/kernel/chain.h',
'src/kernel/checks.cpp',
'src/kernel/checks.h',
'src/kernel/context.cpp',
'src/kernel/context.h',
'src/kernel/mempool_limits.h',
'src/kernel/mempool_options.h',
'src/llmq/blockprocessor.cpp',
'src/llmq/commitment.cpp',
'src/llmq/commitment.h',
'src/llmq/context.cpp',
'src/llmq/debug.cpp',
'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/options.cpp',
'src/llmq/options.h',
'src/llmq/quorums.cpp',
'src/llmq/quorums.h',
'src/llmq/utils.cpp',
'src/llmq/utils.h',
'src/masternode/payments.cpp',
'src/net_processing.cpp',
'src/node/chainstate.cpp',
'src/node/context.cpp',
'src/node/context.h',
'src/node/interfaces.cpp',
'src/node/mempool_args.cpp',
'src/no
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
background
wait
wait-all
cancel
parallel
Loading