Skip to content

backport: bitcoin/bitcoin#22229 test: consolidate to f-strings and related fixes #15390

backport: bitcoin/bitcoin#22229 test: consolidate to f-strings and related fixes

backport: bitcoin/bitcoin#22229 test: consolidate to f-strings and related fixes #15390

Triggered via pull request October 24, 2024 18:03
@knstknst
opened #6357
Status Success
Total duration 11m 0s
Artifacts

predict-conflicts.yml

on: pull_request_target
predict_conflicts
19s
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: 6357, conflictPrs: [ { number: 6265, files: [ 'contrib/debian/examples/dash.conf', 'doc/release-notes-remove-rescan.md', 'src/dummywallet.cpp', 'src/init.cpp', 'src/wallet/init.cpp', 'src/wallet/rpcdump.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/salvage.cpp', 'src/wallet/test/wallet_tests.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'src/wallet/walletdb.cpp', 'src/wallet/walletdb.h', 'src/wallet/wallettool.cpp', 'test/functional/feature_notifications.py', 'test/functional/wallet_basic.py', 'test/functional/wallet_hd.py' ], conflicts: [ 'test/functional/feature_notifications.py' ] }, { number: 6308, files: [ 'test/functional/interface_bitcoin_cli.py', 'test/functional/rpc_txoutproof.py', 'test/functional/test_framework/wallet.py' ], conflicts: [ 'test/functional/interface_bitcoin_cli.py' ] }, { number: 6258, files: [ 'src/bitcoin-wallet.cpp', 'src/qt/forms/createwalletdialog.ui', 'src/wallet/rpcwallet.cpp', 'src/wallet/wallettool.cpp', 'test/functional/feature_coinstatsindex.py', 'test/functional/interface_bitcoin_cli.py', 'test/functional/test_runner.py', 'test/functional/tool_wallet.py' ], conflicts: [ 'test/functional/interface_bitcoin_cli.py' ] }, { number: 6354, files: [ '.style.yapf', 'autogen.sh', 'configure.ac', 'contrib/README.md', 'depends/hosts/darwin.mk', 'depends/packages/native_clang.mk', 'doc/JSON-RPC-interface.md', 'doc/fuzzing.md', 'src/policy/feerate.h', 'src/qt/psbtoperationsdialog.cpp', 'src/test/util/index.cpp', 'src/test/util/index.h', 'src/uint256.h', 'test/functional/mining_basic.py', 'test/functional/test-shell.md', 'test/functional/test_runner.py', 'test/sanitizer_suppressions/tsan' ], conflicts: [ 'test/functional/mining_basic.py' ] }, { number: 6352, files: [ 'configure.ac', 'depends/funcs.mk', 'depends/packages/qt.mk', 'doc/build-freebsd.md', 'doc/build-osx.md', 'doc/fuzzing.md', 'src/bench/nanobench.h', 'src/blockfilter.cpp', 'src/coins.cpp', 'src/index/blockfilterindex.cpp', 'src/key.cpp', 'src/qt/transactiontablemodel.cpp', 'src/rpc/client.cpp', 'src/test/banman_tests.cpp', 'src/test/coins_tests.cpp', 'src/test/fuzz/tx_pool.cpp', 'src/test/key_tests.cpp', 'src/test/merkle_tests.cpp', 'src/test/util_tests.cpp', 'src/util/check.h', 'test/functional/interface_zmq.py', 'test/functional/test-shell.md', 'test/functional/wallet_balance.py', 'test/functional/wallet_groups.py' ], conflicts: [ 'test/functional/interface_zmq.py' ] }, { number: 6348, files: [ 'contrib/devtools/symbol-check.py', 'contrib/guix/INSTALL.md', 'contrib/valgrind.supp', 'src/index/blockfilterindex.cpp', 'src/index/coinstatsindex.cpp', 'src/index/coinstatsindex.h', 'src/index/txindex.cpp', 'src/qt/winshutdownmonitor.cpp', 'src/serialize.h', 'src/test/fuzz/coins_view.cpp', 'src/test/fuzz/fuzz.cpp', 'src/util/trace.h', 'test/functional/feature_config_args.py', 'test/functional/p2p_blockfilters.py', 'test/functional/p2p_invalid_block.py', 'test/functional/rpc_estimatefee.py', 'test/functional/test_runner.py', 'test/functional/wallet_basic.py', 'test/fuzz/test_runner.py', 'test/get_previous_releases.py' ], conflicts: [ 'test/functional/feature_config_args.py' ] }, { number: 6350, files: [ 'c
predict_conflicts
Potential conflicts detected!