backport: Merge bitcoin/bitcoin#28644, gui#765 , 28184, 27944 #7091
+55
−59
Annotations
2 errors and 3 warnings
|
Fail if conflicts exist
Process completed with exit code 1.
|
|
validate potential conflicts
Process completed with exit code 1.
|
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7091,
conflictPrs: [
{
number: 7089,
files: [
'ci/lint/04_install.sh',
'contrib/containers/ci/ci-slim.Dockerfile',
'contrib/linearize/linearize-hashes.py',
'contrib/seeds/generate-seeds.py',
'test/functional/example_test.py',
'test/functional/feature_addressindex.py',
'test/functional/feature_asset_locks.py',
'test/functional/feature_bip68_sequence.py',
'test/functional/feature_coinstatsindex.py',
'test/functional/feature_config_args.py',
'test/functional/feature_dip3_deterministicmns.py',
'test/functional/feature_dip3_v19.py',
'test/functional/feature_dip4_coinbasemerkleroots.py',
'test/functional/feature_filelock.py',
'test/functional/feature_governance.py',
'test/functional/feature_governance_cl.py',
'test/functional/feature_governance_objects.py',
'test/functional/feature_index_prune.py',
'test/functional/feature_init.py',
'test/functional/feature_llmq_chainlocks.py',
'test/functional/feature_llmq_connections.py',
'test/functional/feature_llmq_data_recovery.py',
'test/functional/feature_llmq_dkgerrors.py',
'test/functional/feature_llmq_evo.py',
'test/functional/feature_llmq_is_cl_conflicts.py',
'test/functional/feature_llmq_is_retroactive.py',
'test/functional/feature_llmq_rotation.py',
'test/functional/feature_llmq_signing.py',
'test/functional/feature_llmq_simplepose.py',
'test/functional/feature_llmq_singlenode.py',
'test/functional/feature_masternode_params.py',
'test/functional/feature_mnehf.py',
'test/functional/feature_notifications.py',
'test/functional/feature_pruning.py',
'test/functional/feature_spentindex.py',
'test/functional/feature_txindex.py',
'test/functional/feature_unsupported_utxo_db.py',
'test/functional/interface_bitcoin_cli.py',
'test/functional/interface_usdt_coinselection.py',
'test/functional/interface_usdt_utxocache.py',
'test/functional/interface_usdt_validation.py',
'test/functional/interface_zmq_dash.py',
'test/functional/mempool_compatibility.py',
'test/functional/mempool_packages.py',
'test/functional/mempool_persist.py',
'test/functional/mempool_unbroadcast.py',
'test/functional/mocks/invalid_signer.py',
'test/functional/mocks/signer.py',
'test/functional/p2p_addr_relay.py',
'test/functional/p2p_blocksonly.py',
'test/functional/p2p_getaddr_caching.py',
'test/functional/p2p_instantsend.py',
'test/functional/p2p_message_capture.py',
'test/functional/p2p_platform_ban.py',
'test/functional/p2p_quorum_data.py',
'test/functional/rpc_blockchain.py',
'test/functional/rpc_coinjoin.py',
'test/functional/rpc_createmultisig.py',
'test/functional/rpc_help.py',
'test/functional/rpc_invalid_address_message.py',
'test/functional/rpc_masternode.py',
'test/functional/rpc_mnauth.py',
'test/functional/rpc_net.py',
'test/functional/rpc_netinfo.py',
'test/functional/rpc_psbt.py',
'test/functional/rpc_quorum.py',
'test/functional/rpc_rawtransaction.py',
'test/functional/rpc_verifychainlock.py',
'test/functional/rpc_verifyislock.py',
'test/functional/rpc_wipewallettxes.py',
'test/functional/test_framework/crypto/siphash.py',
'test/functional/test_framework/key.py',
'test/functional/test_framework/test_framework.py',
'test/functional/test_framework/test_node.py',
'test/functional/test_framework/test_shell.py',
'test/functional/test_runner.py',
'test/functional/tool_wallet.py',
'test/functional/wallet_abandonconflict.py',
'test/functional/wallet_avoidreuse.py',
'test/functional/wallet_backup.py',
'test/functional/wallet_backwards_compatibil
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
Loading