Skip to content

backport: bitcoin#24603, #26694, #24669, #22546, #22199, #25817 (mac build) #8939

backport: bitcoin#24603, #26694, #24669, #22546, #22199, #25817 (mac build)

backport: bitcoin#24603, #26694, #24669, #22546, #22199, #25817 (mac build) #8939

Triggered via pull request November 20, 2023 07:48
@knstknst
opened #5718
Status Success
Total duration 33s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

3 warnings
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 5718, conflictPrs: [ { 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: [ 'depends/packages/qt.mk' ] }, { number: 5605, files: [ 'ci/test/00_setup_env.sh', 'ci/test/00_setup_env_mac.sh', 'configure.ac', 'contrib/containers/ci/Dockerfile', 'contrib/devtools/symbol-check.py', 'contrib/guix/manifest.scm', 'contrib/guix/patches/nsis-gcc-10-memmove.patch', 'contrib/guix/patches/vmov-alignment.patch', 'contrib/macdeploy/README.md', 'contrib/macdeploy/gen-sdk', 'depends/Makefile', 'depends/README.md', 'depends/hosts/darwin.mk', 'depends/packages/boost.mk', 'depends/packages/native_clang.mk', 'depends/packages/qt.mk', 'depends/patches/qt/cpp20_ambiguous.patch', 'depends/patches/qt/dont_hardcode_x86_64.patch', 'depends/patches/qt/fix-macos-linker.patch', 'depends/patches/qt/fix_android_jni_static.patch', 'depends/patches/qt/fix_montery_include.patch', 'depends/patches/qt/memory_resource.patch', 'depends/patches/qt/no-xlib.patch', 'doc/dependencies.md', 'src/.clang-format', 'src/bls/bls_worker.cpp', 'src/coinjoin/coinjoin.h', 'src/evo/deterministicmns.cpp', 'src/evo/deterministicmns.h', 'src/leveldb/util/env_windows.cc', 'src/llmq/utils.cpp', 'src/spork.cpp', 'src/util/ranges.h' ], conflicts: [ 'depends/packages/qt.mk' ] } ] }
main
Potential conflicts detected!