Skip to content

refactor: backport bitcoin#24356, extend -socketevents to Sock, implement Sock::WaitMany{Epoll, KQueue} #14853

refactor: backport bitcoin#24356, extend -socketevents to Sock, implement Sock::WaitMany{Epoll, KQueue}

refactor: backport bitcoin#24356, extend -socketevents to Sock, implement Sock::WaitMany{Epoll, KQueue} #14853

Triggered via pull request September 26, 2024 21:33
@kwvgkwvg
synchronize #6018
Status Success
Total duration 31s
Artifacts

predict-conflicts.yml

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

Annotations

4 warnings
predict_conflicts
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/
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
predict_conflicts
{ pull_number: 6018, 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/net.h' ] }, { number: 6132, files: [ 'src/evo/assetlocktx.cpp', 'src/evo/deterministicmns.cpp', 'src/evo/mnhftx.cpp', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/governance/governance.cpp', 'src/llmq/quorums.cpp', 'src/llmq/signing.cpp', 'src/llmq/signing_shares.cpp', 'src/llmq/signing_shares.h', 'src/masternode/node.cpp', 'src/qt/masternodelist.cpp', 'src/rpc/evo.cpp', 'src/rpc/masternode.cpp', 'src/rpc/quorums.cpp', 'src/test/evo_deterministicmns_tests.cpp' ], conflicts: [ 'src/masternode/node.cpp' ] }, { number: 6267, files: [ 'contrib/devtools/copyright_header.py', 'doc/release-notes-6267.md', 'src/Makefile.am', 'src/init.cpp', 'src/net.cpp', 'src/net_processing.cpp', 'src/stats/client.cpp', 'src/stats/client.h', 'src/stats/rawsender.cpp', 'src/stats/rawsender.h', 'src/statsd_client.cpp', 'src/statsd_client.h', 'src/test/util/setup_common.cpp', 'src/txorphanage.cpp', 'src/validation.cpp', 'test/lint/lint-locale-dependence.sh', 'test/util/data/non-backported.txt' ], conflicts: [ 'src/net.cpp' ] }, { number: 6284, files: [ '.cirrus.yml', 'doc/fuzzing.md', 'doc/tor.md', 'src/net_processing.cpp', 'src/node/transaction.cpp', 'src/test/fuzz/util.cpp', 'src/test/fuzz/util.h', 'src/validation.cpp', 'src/validation.h', 'test/functional/mempool_unbroadcast.py', 'test/functional/rpc_rawtransaction.py', 'test/functional/test_runner.py', 'test/lint/lint-python.sh' ], conflicts: [ 'src/test/fuzz/util.cpp', 'src/test/fuzz/util.h' ] }, { number: 6276, files: [ 'src/net.cpp', 'src/rpc/client.cpp', 'src/rpc/net.cpp', 'src/test/fuzz/rpc.cpp', 'test/functional/feature_dip3_v19.py', 'test/functional/feature_llmq_chainlocks.py', 'test/functional/feature_llmq_evo.py', 'test/functional/feature_llmq_rotation.py', 'test/functional/feature_mnehf.py', 'test/functional/p2p_disconnect_ban.py', 'test/functional/p2p_net_deadlock.py', 'test/functional/rpc_net.py', 'test/functional/test_framework/test_framework.py', 'test/functional/test_framework/util.py', 'test/functional/test_runner.py' ], conflicts: [ 'src/net.cpp' ] } ] }
predict_conflicts
Potential conflicts detected!