Skip to content

Commit de79f3a

Browse files
committed
build-debian-based: 24.04+x86_64 - clang for 10.6 amd64-ubuntu-2404-clang18-asan
Github action where running out of space. https://github.com/MariaDB/buildbot/actions/runs/20983884237/job/60314128205?pr=886 The requirement for clang in the 24.04 is only for x86_64 for the 10.6 asan build. This isn't required on other architectures and there's no need for a 22.04 clang either. In 10.11+ branches the msan builder is used for ASAN.
1 parent a3fca5d commit de79f3a

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

ci_build_images/debian.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,10 @@ RUN . /etc/os-release \
9898
&& if [ "${VERSION_ID}" != 18.04 ]; then \
9999
apt-get -y install --no-install-recommends flex; \
100100
fi \
101-
&& if [ "${VERSION_ID}" = 22.04 ]; then \
102-
apt-get -y install --no-install-recommends clang-14 libpcre3-dev llvm; \
103-
elif [ "${VERSION_ID}" = 24.04 ]; then \
101+
&& if [ "${VERSION_ID}" = 24.04 ] && [ "$(arch)" = "x86_64" ]; then \
104102
# https://packages.ubuntu.com/noble/libclang-rt-18-dev, provider of asan, needs 32bit deps for amd64 \
105-
if [ "$(arch)" = "x86_64" ]; then dpkg --add-architecture i386 && apt-get update; fi \
103+
dpkg --add-architecture i386 \
104+
&& apt-get update \
106105
&& apt-get -y install --no-install-recommends clang llvm-dev libclang-rt-18-dev; \
107106
fi \
108107
&& apt-get clean

0 commit comments

Comments
 (0)