Skip to content

backport: merge bitcoin#24252, #24301, #25808, #25873, #26557, #25465, #26952, #25898:, #30217, #24266, partial bitcoin#28622 (replace boost::filesystem with std::filesystem: part 2) #13986

backport: merge bitcoin#24252, #24301, #25808, #25873, #26557, #25465, #26952, #25898:, #30217, #24266, partial bitcoin#28622 (replace boost::filesystem with std::filesystem: part 2)

backport: merge bitcoin#24252, #24301, #25808, #25873, #26557, #25465, #26952, #25898:, #30217, #24266, partial bitcoin#28622 (replace boost::filesystem with std::filesystem: part 2) #13986

Triggered via pull request August 10, 2024 21:10
@kwvgkwvg
synchronize #6150
Status Success
Total duration 31s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
main
The following actions uses Node.js version which is deprecated 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/
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 6150, conflictPrs: [ { number: 4629, files: [ 'src/Makefile.qttest.include', 'src/qt/governancelist.cpp', 'src/qt/governancelist.h', 'src/qt/test/proposaltests.cpp', 'src/qt/test/proposaltests.h', 'src/qt/test/test_main.cpp' ], conflicts: [ 'src/Makefile.qttest.include' ] }, { number: 4686, files: [ 'configure.ac', 'depends/Makefile', 'depends/packages/packages.mk', 'depends/packages/qt.mk', 'src/bench/block_assemble.cpp', 'src/chainparams.cpp', 'src/chainparams.h', 'src/consensus/consensus.h', 'src/consensus/params.h', 'src/consensus/tx_verify.cpp', 'src/qt/paymentserver.cpp', 'src/qt/test/test_main.cpp', 'src/qt/transactiondesc.cpp', 'src/random.cpp', 'src/rpc/misc.cpp', 'src/txmempool.cpp', 'src/wallet/wallet.cpp', 'test/functional/feature_llmq_chainlocks.py', 'test/functional/test_framework/test_framework.py' ], conflicts: [ 'configure.ac', 'depends/packages/packages.mk' ] }, { number: 5167, files: [ 'contrib/devtools/copyright_header.py', 'src/Makefile.am', 'src/analytics/sample.cpp', 'src/analytics/sample.h', 'src/analytics/sdclient.cpp', 'src/analytics/sdclient.h', 'src/analytics/sender.cpp', 'src/analytics/sender.h', 'src/init.cpp', 'src/net.cpp', 'src/net_processing.cpp', 'src/netbase.cpp', 'src/netbase.h', 'src/statsd_client.cpp', 'src/statsd_client.h', 'src/test/util/setup_common.cpp', 'src/validation.cpp', 'test/lint/lint-circular-dependencies.sh', 'test/lint/lint-cppcheck-dash.sh', 'test/lint/lint-format-strings.py', 'test/lint/lint-locale-dependence.sh' ], conflicts: [ 'src/Makefile.am' ] }, { number: 5943, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/governance/governance.cpp', 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/signing.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/protocol.h', 'src/spork.cpp', 'src/spork.h', 'src/test/fuzz/txrequest.cpp', 'src/test/txrequest_tests.cpp', 'src/txrequest.cpp', 'src/txrequest.h', 'test/functional/p2p_tx_download.py' ], conflicts: [ 'src/Makefile.am', 'src/Makefile.test.include' ] }, { number: 5931, files: [ '.gitlab-ci.yml', '.travis.yml', 'ci/dash/build_depends.sh', 'ci/dash/matrix.sh', 'ci/test/00_setup_env_native_fuzz.sh', 'ci/test/00_setup_env_native_fuzz_with_valgrind.sh', 'ci/test/00_setup_env_native_msan.sh', 'ci/test/04_install.sh', 'ci/test/05_before_script.sh' ], conflicts: [ 'ci/test/00_setup_env_native_fuzz.sh', 'ci/test/00_setup_env_native_fuzz_with_valgrind.sh' ] }, { number: 6019, files: [ 'ci/test/00_setup_env_arm.sh', 'ci/test/00_setup_env_mac.sh', 'ci/test/00_setup_env_mac_host.sh', 'ci/test/00_setup_env_native_asan.sh', 'ci/test/00_setup_env_native_fuzz.sh', 'ci/test/00_setup_env_native_multiprocess.sh', 'ci/test/00_setup_env_native_nowallet.sh', 'ci/test/00_setup_env_native_qt5.sh', 'ci/test/00_setup_env_native_tsan.sh', 'ci/test/00_setup_env_s390x.sh', 'ci/test/00_setup_env_win64.sh', 'configure.ac', 'doc/Doxyfile.in', 'doc/build-openbsd.md', 'doc/external-signer.md', 'src/Makefile.am', 'src/Makefile.test.include', 'src/dummywallet.cpp', 'src/external_signer.cpp', 'sr
main
Potential conflicts detected!