Skip to content

Commit 8243670

Browse files
hebastoFabcien
authored andcommitted
ci: Adjust Docker image to Debian 12 "bookworm"
Summary: ``` Changes in packages are significant, for instance: gcc 10.2. --> 12.2 clang 11.0 --> 14.0 wine 5.0 --> 8.0 which requires certain adjustments provided in this PR. ``` Partial backport of [[bitcoin-core/secp256k1#1356 | secp256k1#1356]]. The first commit is missing due to a missing dependency, and part of the last one because we don't have windows support yet. Depends on D18158. This unbreaks the secp256k1 CI on master. Test Plan: See CI (the issue occurs after the CI migration to bookworm) here: https://cirrus-ci.com/build/6479968802177024 Reviewers: #bitcoin_abc, PiRK Reviewed By: #bitcoin_abc, PiRK Differential Revision: https://reviews.bitcoinabc.org/D18159
1 parent 7adfed3 commit 8243670

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

ci/build_autotools.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,22 @@ fi
2626

2727
$CC --version
2828

29+
# Workaround for https://bugs.kde.org/show_bug.cgi?id=452758 (fixed in valgrind 3.20.0).
30+
case "${CC:-undefined}" in
31+
clang*)
32+
if [ "$CTIMETEST" = "yes" ] && [ "$WITH_VALGRIND" = "yes" ]
33+
then
34+
export CFLAGS="${CFLAGS:+$CFLAGS }-gdwarf-4"
35+
else
36+
case "$WRAPPER_CMD" in
37+
valgrind*)
38+
export CFLAGS="${CFLAGS:+$CFLAGS }-gdwarf-4"
39+
;;
40+
esac
41+
fi
42+
;;
43+
esac
44+
2945
./autogen.sh
3046

3147
mkdir buildautotools

ci/linux-debian.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-get update
88
# llvm: for llvm-symbolizer, which is used by clang's UBSan for symbolized stack traces
99
RUN apt-get install --no-install-recommends --no-upgrade -y \
1010
automake cmake default-jdk dpkg-dev libssl-dev libtool make ninja-build pkg-config python3 qemu-user valgrind \
11-
gcc clang llvm libc6-dbg \
11+
gcc clang llvm libclang-rt-dev libc6-dbg \
1212
g++ \
13-
gcc-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 libubsan1:i386 libasan6:i386 \
13+
gcc-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 libubsan1:i386 libasan8:i386 \
1414
gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x

0 commit comments

Comments
 (0)