backport: Merge bitcoin#24434, 23136 #15903
Annotations
4 warnings
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/
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 6305,
conflictPrs: [
{
number: 6018,
files: [
'src/i2p.cpp',
'src/masternode/node.cpp',
'src/net.cpp',
'src/net.h',
'src/netbase.cpp',
'src/netbase.h',
'src/test/fuzz/fuzz.cpp',
'src/test/fuzz/i2p.cpp',
'src/test/fuzz/util.cpp',
'src/test/fuzz/util.h',
'src/test/i2p_tests.cpp',
'src/test/util/net.h',
'src/util/sock.cpp',
'src/util/sock.h',
'src/util/time.cpp',
'src/util/time.h'
],
conflicts: [ 'src/net.cpp' ]
},
{
number: 6380,
files: [
'src/bitcoin-cli.cpp',
'src/net.cpp',
'src/test/fuzz/rpc.cpp',
'src/util/ranges.h',
'src/wallet/wallet.cpp'
],
conflicts: [ 'src/net.cpp' ]
},
{
number: 6389,
files: [
'.cirrus.yml',
'.github/workflows/build.yml',
'.gitignore',
'.gitlab-ci.yml',
'Makefile.am',
'build-aux/m4/bitcoin_runtime_lib.m4',
'build-aux/m4/l_filesystem.m4',
'ci/test/00_setup_env_mac.sh',
'ci/test/00_setup_env_native_cxx20.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_tsan.sh',
'ci/test/00_setup_env_native_ubsan.sh',
'ci/test/00_setup_env_native_valgrind.sh',
'ci/test/04_install.sh',
'ci/test/05_before_script.sh',
'configure.ac',
'contrib/containers/ci/Dockerfile',
'contrib/containers/develop/docker-compose.yml',
'contrib/containers/guix/Dockerfile',
'contrib/containers/guix/scripts/guix-start',
'contrib/devtools/security-check.py',
'contrib/devtools/symbol-check.py',
'contrib/devtools/test-security-check.py',
'contrib/devtools/test-symbol-check.py',
'contrib/guix/Dockerfile',
'contrib/guix/guix-build',
'contrib/guix/libexec/build.sh',
'contrib/guix/libexec/codesign.sh',
'contrib/guix/libexec/prelude.bash',
'contrib/guix/manifest.scm',
'contrib/guix/patches/binutils-unaligned-default.patch',
'contrib/guix/patches/gcc-broken-longjmp.patch',
'contrib/guix/patches/gcc-remap-guix-store.patch',
'contrib/guix/patches/glibc-2.27-fcommon.patch',
'contrib/guix/patches/glibc-guix-prefix.patch',
'contrib/guix/patches/glibc-ldd-x86_64.patch',
'contrib/guix/patches/glibc-versioned-locpath.patch',
'contrib/guix/patches/lief-fix-ppc64-nx-default.patch',
'contrib/guix/patches/nsis-disable-installer-reloc.patch',
'contrib/guix/patches/nsis-gcc-10-memmove.patch',
'contrib/guix/patches/vmov-alignment.patch',
'contrib/macdeploy/README.md',
'contrib/macdeploy/background.tiff',
'contrib/macdeploy/gen-sdk',
'contrib/macdeploy/macdeployqtplus',
'depends/Makefile',
'depends/README.md',
'depends/builders/darwin.mk',
'depends/builders/default.mk',
'depends/builders/openbsd.mk',
'depends/config.site.in',
'depends/funcs.mk',
'depends/hosts/android.mk',
'depends/hosts/darwin.mk',
'depends/hosts/default.mk',
'depends/hosts/freebsd.mk',
'depends/hosts/linux.mk',
'depends/hosts/mingw32.mk',
'depends/hosts/netbsd.mk',
'depends/hosts/openbsd.mk',
'depends/packages.md',
'depends/packages/bdb.mk',
'depends/packages/libnatpmp.mk',
'depends/packages/miniupnpc.mk',
'depends/packages/native_cctools.mk',
'depends/packages/native_ds_store.mk',
'depends/packages/native_libdmg-hfsplus.mk',
'depends/packages/native_libtapi.mk',
'depends/packages/native_llvm.mk',
'depends/packages/native_mac_alias.mk',
'depends/packages/packages.mk',
'depends/packages/qt.mk',
'depends/packages/zeromq.mk',
'depends/patches/libnatpmp/no_libtool.patch',
|
check for potential conflicts
Potential conflicts detected!
|
Loading