Check Potential Conflicts #12805
Annotations
4 warnings
main
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
main
{
pull_number: 6036,
conflictPrs: [
{
number: 4956,
files: [
'src/evo/simplifiedmns.cpp',
'src/rpc/server.cpp',
'src/util/ranges.h',
'src/validation.cpp'
],
conflicts: [ 'src/validation.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/validation.cpp' ]
},
{
number: 5799,
files: [
'src/bloom.cpp',
'src/bloom.h',
'src/chainparams.cpp',
'src/consensus/params.h',
'src/deploymentinfo.cpp',
'src/evo/deterministicmns.cpp',
'src/evo/dmnstate.cpp',
'src/evo/dmnstate.h',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/simplifiedmns.cpp',
'src/evo/simplifiedmns.h',
'src/llmq/ehf_signals.cpp',
'src/masternode/payments.cpp',
'src/qt/masternodelist.cpp',
'src/rpc/blockchain.cpp',
'src/rpc/evo.cpp',
'src/rpc/masternode.cpp',
'src/test/block_reward_reallocation_tests.cpp',
'src/test/data/trivially_invalid.json',
'src/test/data/trivially_valid.json',
'src/test/evo_deterministicmns_tests.cpp',
'src/test/evo_trivialvalidation.cpp',
'test/functional/feature_dip0026.py',
'test/functional/feature_dip3_deterministicmns.py',
'test/functional/feature_llmq_evo.py',
'test/functional/rpc_blockchain.py',
'test/functional/rpc_masternode.py',
'test/functional/test_framework/test_framework.py',
'test/functional/test_runner.py'
],
conflicts: [
'src/masternode/payments.cpp',
'test/functional/test_runner.py'
]
},
{
number: 5860,
files: [
'src/Makefile.test.include',
'src/bench/verify_script.cpp',
'src/chainparams.cpp',
'src/consensus/params.h',
'src/deploymentinfo.cpp',
'src/policy/policy.cpp',
'src/policy/policy.h',
'src/script/interpreter.cpp',
'src/script/interpreter.h',
'src/script/script_error.cpp',
'src/script/script_error.h',
'src/script/sign.cpp',
'src/test/checkdatasig_tests.cpp',
'src/test/data/sighash_dip0143.json',
'src/test/dip0020opcodes_tests.cpp',
'src/test/dip0143_tests.cpp',
'src/test/fuzz/eval_script.cpp',
'src/test/fuzz/signature_checker.cpp',
'src/test/script_tests.cpp',
'src/test/sighash_tests.cpp',
'src/validation.cpp',
'test/functional/feature_dip0143_activation.py',
'test/functional/test_framework/script.py',
'test/functional/test_runner.py'
],
conflicts: [ 'src/validation.cpp', 'test/functional/test_runner.py' ]
},
{
number: 6019,
files: [
'ci/test/00_setup_env_arm.sh',
'ci/test/00_setup_env_mac.sh',
'ci/test/00_setup_env_mac_host.sh',
'ci/test/00_setup_env_native_asan.sh',
'ci/test/00_setup_env_native_fuzz.sh',
'ci/test/00_setup_env_native_multiprocess.sh',
'ci/test/00_setup_env_native_nowallet.sh',
'ci/test/00_setup_env_native_qt5.sh',
'ci/test/00_setup_env_native_tsan.sh',
'ci/test/00_setup_env_s390x.sh',
'ci/test/00_setup_env_win64.sh',
'configure.ac',
'doc
|
main
Potential conflicts detected!
|