Skip to content

Commit 7b9e22e

Browse files
committed
Merge commit '71275a1b5e08706c18229445bd218a863c11397b'
2 parents 2a7e970 + 71275a1 commit 7b9e22e

File tree

396 files changed

+18832
-49106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+18832
-49106
lines changed

depend/bitcoin/.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ task:
143143
FILE_ENV: "./ci/test/00_setup_env_native_previous_releases.sh"
144144

145145
task:
146-
name: 'TSan, depends, gui'
146+
name: 'TSan, depends, no gui'
147147
<< : *GLOBAL_TASK_TEMPLATE
148148
persistent_worker:
149149
labels:

depend/bitcoin/.github/ci-test-each-commit-exec.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,25 @@ def run(cmd, **kwargs):
1717

1818

1919
def main():
20-
print("Running test-one-commit on ...")
20+
print("Running tests on commit ...")
2121
run(["git", "log", "-1"])
2222

2323
num_procs = int(run(["nproc"], stdout=subprocess.PIPE).stdout)
2424

25-
# Use clang++, because it is a bit faster and uses less memory than g++
2625
run([
2726
"cmake",
2827
"-B",
2928
"build",
3029
"-Werror=dev",
30+
# Use clang++, because it is a bit faster and uses less memory than g++
3131
"-DCMAKE_C_COMPILER=clang",
3232
"-DCMAKE_CXX_COMPILER=clang++",
33+
# Use mold, because it is faster than the default linker
34+
"-DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=mold",
35+
# Use Debug build type for more debug checks, but enable optimizations
36+
"-DAPPEND_CXXFLAGS='-O3 -g2'",
37+
"-DAPPEND_CFLAGS='-O3 -g2'",
38+
"-DCMAKE_BUILD_TYPE=Debug",
3339
"-DWERROR=ON",
3440
"-DWITH_ZMQ=ON",
3541
"-DBUILD_GUI=ON",

depend/bitcoin/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
git config user.name "CI"
7878
- run: |
7979
sudo apt-get update
80-
sudo apt-get install clang ccache build-essential cmake ninja-build pkgconf python3-zmq libevent-dev libboost-dev libsqlite3-dev systemtap-sdt-dev libzmq3-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev -y
80+
sudo apt-get install clang mold ccache build-essential cmake ninja-build pkgconf python3-zmq libevent-dev libboost-dev libsqlite3-dev systemtap-sdt-dev libzmq3-dev qt6-base-dev qt6-tools-dev qt6-l10n-tools libqrencode-dev -y
8181
- name: Compile and run tests
8282
run: |
8383
# Run tests on commits after the last merge commit and before the PR head commit

depend/bitcoin/.tx/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[main]
22
host = https://www.transifex.com
33

4-
[o:bitcoin:p:bitcoin:r:qt-translation-029x]
4+
[o:bitcoin:p:bitcoin:r:qt-translation-030x]
55
file_filter = src/qt/locale/bitcoin_<lang>.xlf
66
source_file = src/qt/locale/bitcoin_en.xlf
77
source_lang = en

depend/bitcoin/CMakePresets.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"version": 3,
3-
"cmakeMinimumRequired": {"major": 3, "minor": 21, "patch": 0},
43
"configurePresets": [
54
{
65
"name": "vs2022",

depend/bitcoin/ci/lint/01_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ ${CI_RETRY_EXE} pip3 install \
4646
ruff==0.5.5 \
4747
vulture==2.6
4848

49-
SHELLCHECK_VERSION=v0.8.0
49+
SHELLCHECK_VERSION=v0.11.0
5050
curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | \
5151
tar --xz -xf - --directory /tmp/
5252
mv "/tmp/shellcheck-${SHELLCHECK_VERSION}/shellcheck" /usr/bin/
5353

54-
MLC_VERSION=v0.19.0
54+
MLC_VERSION=v1
5555
MLC_BIN=mlc-x86_64-linux
5656
curl -sL "https://github.com/becheran/mlc/releases/download/${MLC_VERSION}/${MLC_BIN}" -o "/usr/bin/mlc"
5757
chmod +x /usr/bin/mlc

depend/bitcoin/ci/test/00_setup_env_arm.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export USE_BUSY_BOX=true
1616
export RUN_UNIT_TESTS=true
1717
export RUN_FUNCTIONAL_TESTS=false
1818
export GOAL="install"
19+
export CI_LIMIT_STACK_SIZE=1
1920
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
2021
# This could be removed once the ABI change warning does not show up by default
2122
export BITCOIN_CONFIG="-DREDUCE_EXPORTS=ON -DCMAKE_CXX_FLAGS='-Wno-psabi -Wno-error=maybe-uninitialized'"

depend/bitcoin/ci/test/00_setup_env_mac_native.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export LC_ALL=C.UTF-8
1111
export PIP_PACKAGES="--break-system-packages zmq"
1212
export GOAL="install deploy"
1313
export CMAKE_GENERATOR="Ninja"
14-
export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DBUILD_KERNEL_LIB=ON -DBUILD_KERNEL_TEST=ON -DREDUCE_EXPORTS=ON"
14+
export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DBUILD_KERNEL_LIB=ON -DBUILD_KERNEL_TEST=ON -DREDUCE_EXPORTS=ON -DCMAKE_EXE_LINKER_FLAGS='-Wl,-stack_size -Wl,0x80000'"
1515
export CI_OS_NAME="macos"
1616
export NO_DEPENDS=1
1717
export OSX_SDK=""

depend/bitcoin/ci/test/00_setup_env_mac_native_fuzz.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CMAKE_GENERATOR="Ninja"
10-
export BITCOIN_CONFIG="-DBUILD_FOR_FUZZING=ON"
10+
export BITCOIN_CONFIG="-DBUILD_FOR_FUZZING=ON -DCMAKE_EXE_LINKER_FLAGS='-Wl,-stack_size -Wl,0x80000'"
1111
export CI_OS_NAME="macos"
1212
export NO_DEPENDS=1
1313
export OSX_SDK=""

depend/bitcoin/ci/test/00_setup_env_native_asan.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ export APT_LLVM_V="20"
2323
export PACKAGES="systemtap-sdt-dev clang-${APT_LLVM_V} llvm-${APT_LLVM_V} libclang-rt-${APT_LLVM_V}-dev python3-zmq qt6-base-dev qt6-tools-dev qt6-l10n-tools libevent-dev libboost-dev libzmq3-dev libqrencode-dev libsqlite3-dev ${BPFCC_PACKAGE}"
2424
export NO_DEPENDS=1
2525
export GOAL="install"
26+
export CI_LIMIT_STACK_SIZE=1
2627
export BITCOIN_CONFIG="\
2728
-DWITH_USDT=ON -DWITH_ZMQ=ON -DBUILD_GUI=ON \
2829
-DSANITIZERS=address,float-divide-by-zero,integer,undefined \
29-
-DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \
30-
-DCMAKE_CXX_COMPILER=clang++-${APT_LLVM_V} \
30+
-DCMAKE_C_COMPILER=clang \
31+
-DCMAKE_CXX_COMPILER=clang++ \
3132
-DCMAKE_C_FLAGS='-ftrivial-auto-var-init=pattern' \
3233
-DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern' \
3334
-DAPPEND_CXXFLAGS='-std=c++23' \

0 commit comments

Comments
 (0)