Skip to content

Commit 95f47a3

Browse files
committed
ci: update noble build
Ubuntu noble clang is now `clang-18`; update that, and update valgrind to v3.23.0 so that clang compiles it properly.
1 parent 13a326f commit 95f47a3

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

ci/docker/noble

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,22 @@ FROM ${BASE} AS apt
44
RUN apt-get update && \
55
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
66
bzip2 \
7-
clang \
7+
clang \
8+
clang-18 \
89
cmake \
910
curl \
1011
gcc \
1112
git \
1213
krb5-user \
13-
libclang-rt-17-dev \
14+
libclang-rt-18-dev \
1415
libcurl4-gnutls-dev \
1516
libgcrypt20-dev \
1617
libhttp-parser-dev \
1718
libkrb5-dev \
1819
libpcre3-dev \
1920
libssl-dev \
2021
libz-dev \
21-
llvm-17 \
22+
llvm-18 \
2223
make \
2324
ninja-build \
2425
openjdk-8-jre-headless \
@@ -41,10 +42,10 @@ RUN cd /tmp && \
4142
scripts/config.pl set MBEDTLS_MD4_C 1 && \
4243
mkdir build build-msan && \
4344
cd build && \
44-
CC=clang-17 CFLAGS="-fPIC" cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
45+
CC=clang-18 CFLAGS="-fPIC" cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
4546
ninja install && \
4647
cd ../build-msan && \
47-
CC=clang-17 CFLAGS="-fPIC" cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DCMAKE_BUILD_TYPE=MemSanDbg -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \
48+
CC=clang-18 CFLAGS="-fPIC" cmake -G Ninja -DENABLE_PROGRAMS=OFF -DENABLE_TESTING=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -DCMAKE_BUILD_TYPE=MemSanDbg -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \
4849
ninja install && \
4950
cd .. && \
5051
rm -rf mbedtls-mbedtls-2.28.6
@@ -55,24 +56,24 @@ RUN cd /tmp && \
5556
cd libssh2-1.11.0 && \
5657
mkdir build build-msan && \
5758
cd build && \
58-
CC=clang-17 CFLAGS="-fPIC" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
59+
CC=clang-18 CFLAGS="-fPIC" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_PREFIX_PATH=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
5960
ninja install && \
6061
cd ../build-msan && \
61-
CC=clang-17 CFLAGS="-fPIC -fsanitize=memory -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer" LDFLAGS="-fsanitize=memory" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=mbedTLS -DCMAKE_PREFIX_PATH=/usr/local/msan -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \
62+
CC=clang-18 CFLAGS="-fPIC -fsanitize=memory -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2 -fno-omit-frame-pointer" LDFLAGS="-fsanitize=memory" cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCRYPTO_BACKEND=mbedTLS -DCMAKE_PREFIX_PATH=/usr/local/msan -DCMAKE_INSTALL_PREFIX=/usr/local/msan .. && \
6263
ninja install && \
6364
cd .. && \
6465
rm -rf libssh2-1.11.0
6566

6667
FROM libssh2 AS valgrind
6768
RUN cd /tmp && \
68-
curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.22.0.tar.bz2 | \
69+
curl --insecure --location --silent --show-error https://sourceware.org/pub/valgrind/valgrind-3.23.0.tar.bz2 | \
6970
tar -xj && \
70-
cd valgrind-3.22.0 && \
71-
CC=clang-17 ./configure && \
71+
cd valgrind-3.23.0 && \
72+
CC=clang-18 ./configure && \
7273
make MAKEFLAGS="-j -l$(grep -c ^processor /proc/cpuinfo)" && \
7374
make install && \
7475
cd .. && \
75-
rm -rf valgrind-3.22.0
76+
rm -rf valgrind-3.23.0
7677

7778
FROM valgrind AS adduser
7879
ARG UID=""

0 commit comments

Comments
 (0)