backport: Merge bitcoin/bitcoin#23050 #14138
Triggered via pull request
August 17, 2024 14:13
vijaydasmp
synchronize
#6221
Status
Success
Total duration
33s
Artifacts
–
Annotations
4 warnings
main
The following actions use a deprecated Node.js version and will be forced to run on node20: actions/checkout@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
|
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
main
{
pull_number: 6221,
conflictPrs: [
{
number: 3495,
files: [ 'src/net_processing.cpp', 'src/validation.h', 'src/version.h' ],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 5167,
files: [
'contrib/devtools/copyright_header.py',
'src/Makefile.am',
'src/analytics/sample.cpp',
'src/analytics/sample.h',
'src/analytics/sdclient.cpp',
'src/analytics/sdclient.h',
'src/analytics/sender.cpp',
'src/analytics/sender.h',
'src/init.cpp',
'src/net.cpp',
'src/net_processing.cpp',
'src/netbase.cpp',
'src/netbase.h',
'src/statsd_client.cpp',
'src/statsd_client.h',
'src/test/util/setup_common.cpp',
'src/validation.cpp',
'test/lint/lint-circular-dependencies.sh',
'test/lint/lint-cppcheck-dash.sh',
'test/lint/lint-format-strings.py',
'test/lint/lint-locale-dependence.sh'
],
conflicts: [ 'src/net_processing.cpp' ]
},
{
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/net_processing.cpp' ]
},
{
number: 6099,
files: [
'contrib/tracing/README.md',
'contrib/tracing/connectblock_benchmark.bt',
'contrib/tracing/log_p2p_traffic.bt',
'contrib/tracing/log_raw_p2p_msgs.py',
'contrib/tracing/p2p_monitor.py',
'doc/build-unix.md',
'doc/dependencies.md',
'doc/release-process.md',
'doc/tracing.md',
'src/net.cpp',
'src/net_processing.cpp',
'src/validation.cpp'
],
conflicts: [ 'src/net_processing.cpp' ]
},
{
number: 6067,
files: [
'src/Makefile.am',
'src/Makefile.bench.include',
'src/bench/load_external.cpp',
'src/bench/rpc_blockchain.cpp',
'src/chain.cpp',
'src/chain.h',
'src/dsnotificationinterface.cpp',
'src/dsnotificationinterface.h',
'src/evo/mnauth.cpp',
'src/evo/mnauth.h',
'src/governance/governance.cpp',
'src/governance/governance.h',
'src/init.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/instantsend.h',
'src/llmq/signing.cpp',
'src/masternode/sync.cpp',
'src/masternode/sync.h',
'src/net.cpp',
'src/net.h',
'src/net_processing.cpp',
'src/net_processing.h',
'src/node/blockstorage.cpp',
'src/node/blockstorage.h',
'src/node/interfaces.cpp',
'src/qt/rpcconsole.cpp',
'src/random.cpp',
'src/random.h',
'src/rest.cpp',
'src/rpc/blockchain.cpp',
'src/rpc/blockchain.h',
'src/rpc/net.cpp',
'src/script/script.h',
'src/spork.cpp',
'src/streams.h',
'src/test/denialofservice_tests.cpp',
'src/test/fuzz/chain.cpp',
'src/test/fuzz/coins_view.cpp',
'src/test/fuzz/connman.cpp',
'src/test/fuzz/load_external_block_file.cpp',
'src/test/fuzz/net.cpp',
'src/test/fuzz/p2p_transport_serialization.cpp',
'src/test/fuzz/process_message.cpp',
'src/test/fuzz/process_messages.cpp',
'src/test/fuzz/util.cpp',
'src/test/fuzz/util.h',
'src/test/net_tests.cpp',
'src/test/pow_tests.c
|
main
Potential conflicts detected!
|