Skip to content

Commit ba29143

Browse files
committed
ci: use Debian Bookworm and Valgrind 3.19 in Valgrind jobs
https://packages.debian.org/bookworm/valgrind
1 parent 7f4ab67 commit ba29143

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:22.04"
9+
export CI_IMAGE_NAME_TAG="debian:bookworm"
1010
export CONTAINER_NAME=ci_native_fuzz_valgrind
1111
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libsqlite3-dev valgrind"
1212
export NO_DEPENDS=1
@@ -15,6 +15,6 @@ export RUN_FUNCTIONAL_TESTS=false
1515
export RUN_FUZZ_TESTS=true
1616
export FUZZ_TESTS_CONFIG="--valgrind"
1717
export GOAL="install"
18-
# Temporarily pin dwarf 4, until valgrind can understand clang's dwarf 5
18+
# Temporarily pin dwarf 4, until using Valgrind 3.20 or later
1919
export BITCOIN_CONFIG="--enable-fuzz --with-sanitizers=fuzzer CC=clang CXX=clang++ CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'"
2020
export CCACHE_SIZE=200M

ci/test/00_setup_env_native_valgrind.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export CI_IMAGE_NAME_TAG="ubuntu:22.04"
9+
export CI_IMAGE_NAME_TAG="debian:bookworm"
1010
export CONTAINER_NAME=ci_native_valgrind
1111
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libsqlite3-dev"
1212
export USE_VALGRIND=1
1313
export NO_DEPENDS=1
1414
export TEST_RUNNER_EXTRA="--nosandbox --exclude feature_init,rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547
1515
export GOAL="install"
16-
# Temporarily pin dwarf 4, until valgrind can understand clang's dwarf 5
16+
# Temporarily pin dwarf 4, until using Valgrind 3.20 or later
1717
export BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no CC=clang CXX=clang++ CFLAGS='-gdwarf-4' CXXFLAGS='-gdwarf-4'" # TODO enable GUI

0 commit comments

Comments
 (0)