backport: merge bitcoin#24794, #23524, #24902, #24915, #24916, #24929, #23506, #24840, #24982, partial bitcoin#25288 (lint backports: part 2) #16057
Annotations
4 warnings
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 6429,
conflictPrs: [
{
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/evo/dmnstate.h' ]
},
{
number: 6259,
files: [
'src/bench/mempool_stress.cpp',
'src/net_processing.cpp',
'src/test/fuzz/string.cpp',
'src/test/fuzz/tx_pool.cpp',
'src/test/getarg_tests.cpp',
'src/test/util_tests.cpp',
'src/txmempool.cpp',
'src/txmempool.h',
'src/util/strencodings.h',
'src/validation.cpp',
'src/validation.h',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/test_runner.py',
'test/functional/wallet_transactiontime_rescan.py',
'test/lint/lint-circular-dependencies.sh',
'test/lint/lint-locale-dependence.sh'
],
conflicts: [ 'test/lint/lint-circular-dependencies.sh' ]
},
{
number: 6182,
files: [
'src/governance/common.cpp',
'src/governance/common.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/object.h',
'src/interfaces/node.h',
'src/rpc/governance.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/feature_governance.py',
'test/functional/feature_governance_cl.py',
'test/functional/feature_governance_objects.py',
'test/functional/interface_zmq_dash.py',
'test/functional/test_framework/governance.py',
'test/functional/test_framework/messages.py'
],
conflicts: [ 'src/governance/common.h' ]
},
{
number: 6378,
files: [
'configure.ac',
'src/Makefile.test.include',
'src/bench/ellswift.cpp',
'src/bitcoin-cli.cpp',
'src/bitcoin-tx.cpp',
'src/bitcoind.cpp',
'src/compat/byteswap.h',
'src/compat/cpuid.h',
'src/compat/endian.h',
'src/compat/stdin.cpp',
'src/crypto/chacha20.h',
'src/crypto/common.h',
'src/crypto/hkdf_sha256_32.h',
'src/crypto/hmac_sha256.h',
'src/crypto/hmac_sha512.h',
'src/crypto/pkcs5_pbkdf2_hmac_sha512.h',
'src/crypto/poly1305.h',
'src/crypto/ripemd160.h',
'src/crypto/sha1.h',
'src/crypto/sha256.h',
'src/crypto/sha256_sse4.cpp',
'src/crypto/sha3.h',
'src/crypto/sha512.h',
'src/dbwrapper.h',
'src/httpserver.cpp',
'src/i2p.cpp',
'src/ipc/interfaces.cpp',
'src/ipc/process.cpp',
'src/memusage.h',
'src/prevector.h',
'src/qt/utilitydialog.cpp',
'src/random.cpp',
'src/random.h',
'src/serialize.h',
'src/span.h',
'src/streams.h',
'src/support/cleanse.h',
'src/test/argsman_tests.cpp',
'src/test/blockchain_tests.cpp',
'src/te
|
check for potential conflicts
Potential conflicts detected!
|
Loading