Skip to content

backport: Merge bitcoin#19316, (Partial) 19725, 19724 #9487

backport: Merge bitcoin#19316, (Partial) 19725, 19724

backport: Merge bitcoin#19316, (Partial) 19725, 19724 #9487

Triggered via pull request December 17, 2023 15:14
@vijaydasmpvijaydasmp
synchronize #5771
Status Failure
Total duration 34s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 3 warnings
main
Process completed with exit code 1.
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 5771, conflictPrs: [ { number: 5149, files: [ 'src/bench/base58.cpp', 'src/bench/bech32.cpp', 'src/bench/bench.cpp', 'src/bench/bench.h', 'src/bench/bench_bitcoin.cpp', 'src/bench/block_assemble.cpp', 'src/bench/bls.cpp', 'src/bench/bls_dkg.cpp', 'src/bench/ccoins_caching.cpp', 'src/bench/chacha20.cpp', 'src/bench/chacha_poly_aead.cpp', 'src/bench/checkblock.cpp', 'src/bench/checkqueue.cpp', 'src/bench/coin_selection.cpp', 'src/bench/crypto_hash.cpp', 'src/bench/data.cpp', 'src/bench/data.h', 'src/bench/duplicate_inputs.cpp', 'src/bench/ecdsa.cpp', 'src/bench/examples.cpp', 'src/bench/gcs_filter.cpp', 'src/bench/hashpadding.cpp', 'src/bench/lockedpool.cpp', 'src/bench/mempool_eviction.cpp', 'src/bench/mempool_stress.cpp', 'src/bench/merkle_root.cpp', 'src/bench/nanobench.cpp', 'src/bench/nanobench.h', 'src/bench/poly1305.cpp', 'src/bench/prevector.cpp', 'src/bench/rollingbloom.cpp', 'src/bench/rpc_mempool.cpp', 'src/bench/string_cast.cpp', 'src/bench/util_time.cpp', 'src/bench/wallet_balance.cpp', 'src/test/addrman_tests.cpp', 'src/test/allocator_tests.cpp', 'src/test/amount_tests.cpp', 'src/test/arith_uint256_tests.cpp', 'src/test/base32_tests.cpp', 'src/test/base58_tests.cpp', 'src/test/base64_tests.cpp', 'src/test/bech32_tests.cpp', 'src/test/bip32_tests.cpp', 'src/test/bip39_tests.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/blockchain_tests.cpp', 'src/test/blockencodings_tests.cpp', 'src/test/blockfilter_index_tests.cpp', 'src/test/blockfilter_tests.cpp', 'src/test/bloom_tests.cpp', 'src/test/bls_tests.cpp', 'src/test/bswap_tests.cpp', 'src/test/cachemap_tests.cpp', 'src/test/cachemultimap_tests.cpp', 'src/test/checkdatasig_tests.cpp', 'src/test/checkqueue_tests.cpp', 'src/test/coins_tests.cpp', 'src/test/compilerbug_tests.cpp', 'src/test/compress_tests.cpp', 'src/test/crypto_tests.cpp', 'src/test/cuckoocache_tests.cpp', 'src/test/dbwrapper_tests.cpp', 'src/test/denialofservice_tests.cpp', 'src/test/descriptor_tests.cpp', 'src/test/dip0020opcodes_tests.cpp', 'src/test/dynamic_activation_thresholds_tests.cpp', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/evo_instantsend_tests.cpp', 'src/test/evo_simplifiedmns_tests.cpp', 'src/test/evo_trivialvalidation.cpp', 'src/test/evo_utils_tests.cpp', 'src/test/flatfile_tests.cpp', 'src/test/fs_tests.cpp', 'src/test/fuzz/FuzzedDataProvider.h', 'src/test/fuzz/addition_overflow.cpp', 'src/test/fuzz/addrdb.cpp', 'src/test/fuzz/addrman.cpp', 'src/test/fuzz/asmap.cpp', 'src/test/fuzz/asmap_direct.cpp', 'src/test/fuzz/autofile.cpp', 'src/test/fuzz/banman.cpp', 'src/test/fuzz/base_encode_decode.cpp', 'src/test/fuzz/bech32.cpp', 'src/test/fuzz/block.cpp', 'src/test/fuzz/block_header.cpp', 'src/test/fuzz/blockfilter.cpp', 'src/test/fuzz/bloom_filter.cpp', 'src/test/fuzz/buffered_file.cpp', 'src/test/fuzz/chain.cpp', 'src/test/fuzz/checkqueue.cpp', 'src/test/fuzz/coins_view.cpp', 'src/test/fuzz/connman.cpp', 'src/test/fuzz/crypto.cpp', 'src/test/fuzz/crypto_aes256.cpp', 'src/test/fuzz/crypto_aes256cbc.cpp', 'src/test/fuzz/crypto_chacha20.cpp', 'src/test/fuzz/crypto_chacha20_poly1305_aead.cpp', 'src/test/fuzz/crypto_common.cpp', 'src/test/fuzz/crypto_hkdf_hmac_sha256_l32.cpp' ], conflicts: [ 'src/test/denialofservice_tests.cpp' ]
main
Potential conflicts detected!