Skip to content

backport: bitcoin#18638 #13163

backport: bitcoin#18638

backport: bitcoin#18638 #13163

Triggered via pull request July 8, 2024 16:59
@knstknst
opened #6103
Status Success
Total duration 56s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
main
The following actions uses Node.js version which is deprecated 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: 6103, conflictPrs: [ { 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.cpp' ] }, { number: 5997, files: [ 'src/net.cpp' ], conflicts: [ 'src/net.cpp' ] }, { number: 6018, files: [ 'src/i2p.cpp', 'src/masternode/node.cpp', 'src/net.cpp', 'src/net.h', 'src/netbase.cpp', 'src/netbase.h', 'src/test/fuzz/fuzz.cpp', 'src/test/fuzz/i2p.cpp', 'src/test/fuzz/util.cpp', 'src/test/fuzz/util.h', 'src/test/i2p_tests.cpp', 'src/test/util/net.h', 'src/util/sock.cpp', 'src/util/sock.h', 'src/util/time.cpp', 'src/util/time.h' ], conflicts: [ 'src/net.cpp' ] }, { number: 6067, files: [ 'src/Makefile.am', 'src/evo/mnauth.cpp', 'src/evo/mnauth.h', 'src/net.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/qt/rpcconsole.cpp', 'src/rest.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/blockchain.h', 'src/rpc/client.cpp', 'src/rpc/coinjoin.cpp', 'src/rpc/evo.cpp', 'src/rpc/governance.cpp', 'src/rpc/masternode.cpp', 'src/rpc/mining.cpp', 'src/rpc/misc.cpp', 'src/rpc/net.cpp', 'src/rpc/net.h', 'src/rpc/quorums.cpp', 'src/rpc/rawtransaction.cpp', 'src/rpc/server.cpp', 'src/rpc/server_util.cpp', 'src/rpc/server_util.h', 'src/test/denialofservice_tests.cpp', 'src/test/fuzz/net.cpp', 'src/test/fuzz/util.cpp', 'src/test/fuzz/util.h', 'src/test/net_tests.cpp', 'src/test/util/net.cpp', 'src/test/util/net.h', 'src/validation.cpp', 'test/functional/feature_minchainwork.py', 'test/functional/p2p_initial_headers_sync.py', 'test/functional/rpc_getblockfrompeer.py', 'test/functional/test_runner.py' ], conflicts: [ 'src/net.cpp' ] }, { number: 6097, files: [ 'src/Makefile.test_util.include', 'src/bench/rpc_blockchain.cpp', 'src/chain.h', 'src/dsnotificationinterface.cpp', 'src/evo/mnauth.cpp', 'src/evo/mnauth.h', 'src/index/base.cpp', 'src/index/coinstatsindex.cpp', 'src/index/txindex.cpp', 'src/init.cpp', 'src/llmq/instantsend.cpp', 'src/masternode/sync.cpp', 'src/masternode/sync.h', 'src/miner.cpp', '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/rest.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/blockchain.h', 'src/rpc/evo.cpp', 'src/rpc/index_util.cpp', 'src/rpc/masternode.cpp', 'src/rpc/misc.cpp', 'src/rpc/net.cpp', 'src/rpc/quorums.cpp', 'src/rpc/rawtransaction.cpp', 'src/test/denialofservice_tests.cpp', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/fuzz/chain.cpp', 'src/test/fuzz/coins_view.cpp', 'src/test/
main
Potential conflicts detected!