Skip to content

Commit af65fd1

Browse files
committed
Merge bitcoin/bitcoin#32560: ci: Move DEBUG=1 to centos task
fa58d6c ci: Move DEBUG=1 to centos task (MarcoFalke) Pull request description: The glibcxx debug mode has many bugs in prior gcc releases: * bitcoin/bitcoin#32524 (comment) * bitcoin/bitcoin#31436 (comment) * ... Instead of working around all of them, just use the existing `ci_native_centos` task with gcc-14 to have it enabled. This also follows the logic of other sanitizers (tsan, asan, ubsan, msan, valgrind, ...) to generally prefer the latest version of the sanitizer for the latests features and bugfixes. Fixes #32524. Also, while touching the `ci_native_previous_releases`, increase g0 to g2, so that it is easier for developers to use gdb inside the CI without having to re-compile ACKs for top commit: hebasto: ACK fa58d6c. fanquake: ACK fa58d6c Tree-SHA512: 26f151887bc39e88353b4ba1f91e913b830d24eac258b7caa0027aa592595150d5e713ededa3ed15a1b84165a94b14b0bfe3eb2fb7314d261d972b63ce01af43
2 parents 548f6b8 + fa58d6c commit af65fd1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ci/test/00_setup_env_native_centos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ export CONTAINER_NAME=ci_native_centos
1010
export CI_IMAGE_NAME_TAG="quay.io/centos/centos:stream10"
1111
export CI_BASE_PACKAGES="gcc-c++ glibc-devel libstdc++-devel ccache make ninja-build git python3 python3-pip which patch xz procps-ng ksh rsync coreutils bison e2fsprogs cmake"
1212
export PIP_PACKAGES="pyzmq"
13-
export DEP_OPTS="DEBUG=1" # Temporarily enable a DEBUG=1 build to check for GCC-bug-117966 regressions. This can be removed once the minimum GCC version is bumped to 12 in the previous releases task, see https://github.com/bitcoin/bitcoin/issues/31436#issuecomment-2530717875
13+
export DEP_OPTS="DEBUG=1"
1414
export GOAL="install"
1515
export BITCOIN_CONFIG="-DWITH_ZMQ=ON -DBUILD_GUI=ON -DREDUCE_EXPORTS=ON -DCMAKE_BUILD_TYPE=Debug"

ci/test/00_setup_env_native_previous_releases.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export CONTAINER_NAME=ci_native_previous_releases
1010
export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:22.04"
1111
# Use minimum supported python3.10 and gcc-11, see doc/dependencies.md
1212
export PACKAGES="gcc-11 g++-11 python3-zmq"
13-
export DEP_OPTS="DEBUG=1 CC=gcc-11 CXX=g++-11"
13+
export DEP_OPTS="CC=gcc-11 CXX=g++-11"
1414
export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
1515
export RUN_UNIT_TESTS_SEQUENTIAL="true"
1616
export RUN_UNIT_TESTS="false"
@@ -20,8 +20,8 @@ export BITCOIN_CONFIG="\
2020
-DWITH_ZMQ=ON -DBUILD_GUI=ON -DREDUCE_EXPORTS=ON \
2121
-DCMAKE_BUILD_TYPE=Debug \
2222
-DCMAKE_C_FLAGS='-funsigned-char' \
23-
-DCMAKE_C_FLAGS_DEBUG='-g0 -O2' \
23+
-DCMAKE_C_FLAGS_DEBUG='-g2 -O2' \
2424
-DCMAKE_CXX_FLAGS='-funsigned-char' \
25-
-DCMAKE_CXX_FLAGS_DEBUG='-g0 -O2' \
25+
-DCMAKE_CXX_FLAGS_DEBUG='-g2 -O2' \
2626
-DAPPEND_CPPFLAGS='-DBOOST_MULTI_INDEX_ENABLE_SAFE_MODE' \
2727
"

0 commit comments

Comments
 (0)