Skip to content

backport: Merge bitcoin#21983, 21756, 21927, revert dashpay#855 #12560

backport: Merge bitcoin#21983, 21756, 21927, revert dashpay#855

backport: Merge bitcoin#21983, 21756, 21927, revert dashpay#855 #12560

Triggered via pull request May 14, 2024 17:00
@vijaydasmpvijaydasmp
synchronize #6008
Status Failure
Total duration 32s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 4 warnings
main
Process completed with exit code 1.
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: 6008, conflictPrs: [ { number: 5600, files: [ 'src/constexpr_if_cxx20.h', 'src/netaddress.cpp', 'src/netaddress.h' ], conflicts: [ 'src/netaddress.cpp' ] }, { number: 6009, files: [ 'src/netaddress.cpp', 'src/test/net_tests.cpp' ], conflicts: [ 'src/netaddress.cpp' ] }, { number: 6015, files: [ 'src/chainparams.cpp', 'src/netaddress.cpp', 'src/rpc/net.cpp', 'src/test/fuzz/deserialize.cpp', 'test/functional/rpc_net.py' ], conflicts: [ 'src/netaddress.cpp' ] }, { number: 5999, files: [ 'src/pubkey.cpp', 'src/pubkey.h', 'src/test/fuzz/script_ops.cpp' ], conflicts: [ 'src/test/fuzz/script_ops.cpp' ] } ] }
main
Potential conflicts detected!