chore: update to LLVM 21 (#26)

Updates the Windows Dockerfile to use LLVM 21. For the Linux Dockerfile we use both versions for now, i.e. LLVM 14 and 21, and at some later point will remove the LLVM 14 dependency entirely.

Author: volsa

linux/Dockerfile

@@ -2,77 +2,54 @@ ARG DEBIAN_VERSION=bookworm
 ARG BASE_IMAGE=debian:$DEBIAN_VERSION
 
 FROM $BASE_IMAGE
-
-# Make sure we are on root
 USER root
 
-ARG RUST_VERSION=1.90
-ARG LLVM_VER=14
-
-# Use the bullseye llvm version because there is no newer one yet
-ARG LLVM_DEBIAN_VERSION=bookworm 
-
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update \
-		&& apt-get upgrade -y \
-		&& apt-get install -y \
-			apt-utils	\
-			git	\
-			wget gnupg curl \
-			build-essential \
-			libz-dev \
-			gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
-			python3-venv
-
-# dpkg --add-architecture arm64 \
+ARG LLVM_VERSION=21
+ARG RUST_VERSION=1.90
 
-# # Setup llvm sources
-# RUN echo "deb http://apt.llvm.org/$LLVM_DEBIAN_VERSION/ llvm-toolchain-$LLVM_DEBIAN_VERSION-$LLVM_VER  main" >> /etc/apt/sources.list.d/llvm.list
-# RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
+# Install LLVM and its dependencies
+RUN apt update \
+    && apt upgrade -y \
+    && apt install -y --no-install-recommends wget curl gnupg build-essential lsb-release software-properties-common \
+    && wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh $LLVM_VERSION \
+    && apt install -y --no-install-recommends clang lld liblld-$LLVM_VERSION-dev libpolly-$LLVM_VERSION-dev
 
-#Install Clang dependencies
-#On bookworm clang is version 14, which is what we have as default.
-#Installing without versions here is convinient for scripts calling clang or lld instead of clang-14/lld-14
-RUN apt-get install -y zip clang lldb lld clangd \
-	clang-$LLVM_VER lldb-$LLVM_VER lld-$LLVM_VER \
-	clangd-$LLVM_VER liblld-$LLVM_VER-dev \
-	llvm-$LLVM_VER-dev libpolly-$LLVM_VER-dev
+# TODO: Remove this once we completely switched over to LLVM 21
+RUN apt install -y zip clang lldb lld clangd clang-14 lldb-14 lld-14 clangd-14 liblld-14-dev llvm-14-dev libpolly-14-dev
 
-# Install llvm-lit, which we use for correctness tests
-ENV XDG_BIN_HOME=/usr/local/bin
-# Download the latest installer
-ADD https://astral.sh/uv/install.sh /uv-installer.sh
-# Run the installer then remove it
-RUN sh /uv-installer.sh && rm /uv-installer.sh && mkdir -p /usr/local/uv
-ENV UV_TOOL_DIR="/usr/local/uv"
+# Install llvm-lit, used by our correctness tests
+COPY --from=ghcr.io/astral-sh/uv:0.9.17 /uv /uvx /bin/
 ENV UV_TOOL_BIN_DIR="/usr/local/bin/"
 RUN uv tool install lit
 
+# Install Rust
 ENV CARGO_HOME=/usr/local/cargo
 ENV RUSTUP_HOME=/usr/local/rustup
-# Get Rust
+
 RUN curl https://sh.rustup.rs -sSf | bash -s -- --profile minimal --default-toolchain none -y
 ENV PATH="${CARGO_HOME}/bin:${PATH}"
 
 RUN rustup toolchain install $RUST_VERSION \
-		&& rustup default $RUST_VERSION \
-		&& rustup component add clippy rustfmt llvm-tools-preview  \
-		&& rustup target add aarch64-unknown-linux-gnu \ 
-		&& rustup target add x86_64-unknown-linux-musl 
-
+    && rustup default $RUST_VERSION \
+    && rustup component add clippy rustfmt llvm-tools-preview \
+    && rustup target add aarch64-unknown-linux-gnu \
+    && rustup target add x86_64-unknown-linux-musl
 
 RUN chmod -R a+rw $CARGO_HOME \
-	&& chmod -R a+rw $RUSTUP_HOME \
-	&& chmod -R a+rw /usr/local/uv \ 
-	&& chmod -R a+rw /usr/local/bin
+    && chmod -R a+rw $RUSTUP_HOME \
+    && chmod -R a+rw /usr/local/bin
+
+# Install cargo-binstall to make subsequent binaries easier to download
+RUN wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-$(uname -m)-unknown-linux-musl.tgz \
+    && tar -xf cargo-binstall-$(uname -m)-unknown-linux-musl.tgz -C $CARGO_HOME/bin \
+    && rm cargo-binstall-*.tgz
 
-#Install bininstall to make subsequent binaries easier to download
-RUN wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-`uname -m`-unknown-linux-musl.tgz && tar -xf cargo-binstall-`uname -m`-unknown-linux-musl.tgz  -C $CARGO_HOME/bin
-#Install documentation and coverage tools
 RUN cargo binstall --no-confirm mdbook grcov cargo-nextest
 
+# Configure container defaults for interactive use
 WORKDIR /build
 ENTRYPOINT ["bash"]
 

windows/Dockerfile

@@ -3,7 +3,7 @@ ARG BASE_IMAGE=mcr.microsoft.com/windows/servercore:$WINDOWS_VERSION
 
 FROM $BASE_IMAGE
 
-ARG LLVM_VER=14.0.6
+ARG LLVM_VER=21.1.7
 ARG RUST_VER=1.90
 ARG ZIP_VERSION=2501
 ARG GIT_VERSION=2.51.0