Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MDBF-793 replace msan-15 builder with deb12-clang-19 builder #482

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/bbw_build_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ jobs:
tag: debian11-aocc
branch: 10.11
platforms: linux/amd64
- dockerfile: debian.Dockerfile msan.Dockerfile
image: debian:11
branch: 10.11
tag: debian11-msan
clang_version: 15
platforms: linux/amd64
- dockerfile: debian.Dockerfile msan.Dockerfile
image: debian:11
branch: 10.11
tag: debian11-msan-clang-16
clang_version: 16
platforms: linux/amd64
- dockerfile: debian.Dockerfile msan.Dockerfile
image: debian:12
branch: 11.4
tag: debian12-msan-clang-18
clang_version: 18
platforms: linux/amd64
- dockerfile: debian.Dockerfile
image: debian:sid
branch: 10.11
Expand Down
14 changes: 9 additions & 5 deletions ci_build_images/msan.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ ENV MSAN_SYMBOLIZER_PATH=/msan-libs/bin/llvm-symbolizer-msan

ENV PATH=$MSAN_LIBDIR/bin:$PATH

RUN mkdir $MSAN_LIBDIR \
RUN . /etc/os-release; mkdir $MSAN_LIBDIR \
&& mkdir $MSAN_LIBDIR/bin \
&& printf "#!/bin/sh\nunset LD_LIBRARY_PATH\nexec llvm-symbolizer-%s \"\$@\"" "${CLANG_VERSION}" > $MSAN_SYMBOLIZER_PATH \
&& printf '#!/bin/sh\nunset LD_LIBRARY_PATH\nexec /usr/bin/gdb "$@"' > $GDB_PATH \
&& curl -sL https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-snapshot.gpg \
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] \
http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" > /etc/apt/sources.list.d/llvm-toolchain.list \
http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-${CLANG_VERSION} main" > /etc/apt/sources.list.d/llvm-toolchain.list \
&& echo "deb-src [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] \
http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list.d/llvm-toolchain.list \
http://apt.llvm.org/${VERSION_CODENAME}/ llvm-toolchain-${VERSION_CODENAME}-${CLANG_VERSION} main" >> /etc/apt/sources.list.d/llvm-toolchain.list \
&& apt-get update \
&& apt-get -y install --no-install-recommends \
clang-${CLANG_VERSION} \
Expand All @@ -37,7 +37,7 @@ RUN mkdir $MSAN_LIBDIR \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER=clang-${CLANG_VERSION} \
-DCMAKE_CXX_COMPILER=clang++-${CLANG_VERSION} \
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi" \
-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
-DLLVM_USE_SANITIZER=MemoryWithOrigins \
&& make -C build -j "$(nproc)" \
&& cp -aL build/lib/libc++.so* $MSAN_LIBDIR \
Expand Down Expand Up @@ -85,6 +85,8 @@ RUN apt-get source gnutls28 \
\
&& apt-get source gmp \
&& mv gmp-*/* . \
&& mkdir -p doc \
&& echo 'all:' > doc/Makefile.in \
&& mk-build-deps -it 'apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' \
&& ./configure \
--disable-assembly \
Expand All @@ -98,6 +100,8 @@ ENV CXXFLAGS="$CFLAGS"
RUN apt-get source cracklib2 \
&& mv cracklib2-*/* . \
&& mk-build-deps -it 'apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' \
&& aclocal \
&& automake --add-missing \
&& ./configure \
--with-default-dict=/usr/share/dict/cracklib-small \
&& make -j "$(nproc)" \
Expand All @@ -117,4 +121,4 @@ RUN apt-get source cracklib2 \
&& chmod -R a+x $MSAN_LIBDIR/bin/*

ENV CFLAGS="-fno-omit-frame-pointer -O2 -g -fsanitize=memory"
ENV CXXFLAGS="$CFLAGS"
ENV CXXFLAGS="$CFLAGS"
4 changes: 2 additions & 2 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"amd64-debian-10-deb-autobake",
"amd64-debian-10-last-N-failed",
"amd64-debian-11-debug-ps-embedded",
"amd64-debian-11-msan",
"amd64-debian-11-msan-clang-16",
"amd64-debian-12-msan-clang-18",
"amd64-fedora-38",
"amd64-fedora-38-last-N-failed",
"amd64-ubuntu-2004-debug",
Expand Down Expand Up @@ -122,8 +122,8 @@
"aarch64-rhel-9",
"amd64-centos-stream9",
"amd64-debian-11",
"amd64-debian-11-msan",
"amd64-debian-11-msan-clang-16",
"amd64-debian-12-msan-clang-18",
"amd64-debian-12-asan-ubsan",
"amd64-debian-12-rocksdb",
"amd64-fedora-38",
Expand Down
12 changes: 6 additions & 6 deletions master-docker-nonstandard-2/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ addWorker(
addWorker(
"apexis-bbw",
3,
"-msan-clang-debian-11",
"quay.io/mariadb-foundation/bb-worker:debian11-msan",
"-msan-clang-debian-12",
"quay.io/mariadb-foundation/bb-worker:debian12-msan-clang-18",
jobs=20,
save_packages=False,
)
Expand Down Expand Up @@ -1346,13 +1346,13 @@ c["builders"].append(

c["builders"].append(
util.BuilderConfig(
name="amd64-debian-11-msan",
workernames=workers["x64-bbw-docker-msan-clang-debian-11"],
tags=["Debian", "quick", "clang-15", "msan"],
name="amd64-debian-12-msan-clang18",
workernames=workers["x64-bbw-docker-msan-clang-debian-12"],
tags=["Debian", "quick", "clang-18", "msan"],
collapseRequests=True,
nextBuild=nextBuild,
canStartBuild=canStartBuild,
properties={"c_compiler": "clang-15", "cxx_compiler": "clang++-15"},
properties={"c_compiler": "clang-18", "cxx_compiler": "clang++-18"},
locks=getLocks,
factory=f_msan_build,
)
Expand Down
Loading