From 055ac3f7051a6c3d94c0d042bb44c3747fc1356b Mon Sep 17 00:00:00 2001
From: Niklas Dusenlund <niklas.dusenlund@bitbox.swiss>
Date: Wed, 10 Sep 2025 13:09:15 +0200
Subject: [PATCH] build: Align llvm with rust version

---
 .ci/check-style   |  2 +-
 .containerversion |  2 +-
 Dockerfile        | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci/check-style b/.ci/check-style
index 9da2c9a17b..1f00bb02dc 100755
--- a/.ci/check-style
+++ b/.ci/check-style
@@ -8,7 +8,7 @@ set -e
 # Exit on pipe fail
 set -o pipefail
 
-CLANGFORMAT=${CLANGFORMAT:-clang-format-18}
+CLANGFORMAT=${CLANGFORMAT:-clang-format-20}
 RUSTFMT=${RUSTFMT:-rustfmt}
 
 command -v git >/dev/null 2>&1 || { echo >&2 "git is missing"; exit 1; }
diff --git a/.containerversion b/.containerversion
index 95f9650f01..e373ee695f 100644
--- a/.containerversion
+++ b/.containerversion
@@ -1 +1 @@
-49
+50
diff --git a/Dockerfile b/Dockerfile
index d7e8ffe90b..c6a6ca651f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,9 +27,9 @@ ARG TARGETARCH
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y wget nano rsync curl gnupg2 jq unzip bzip2 xz-utils
 
-# for clang-*-15, see https://apt.llvm.org/
-RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" >> /etc/apt/sources.list && \
-    echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" >> /etc/apt/sources.list && \
+# for clang-*-20, see https://apt.llvm.org/. Stay in sync with rust compiler
+RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" >> /etc/apt/sources.list && \
+    echo "deb-src http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main" >> /etc/apt/sources.list && \
     wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
 
 # Install gcc8-arm-none-eabi
@@ -48,7 +48,7 @@ RUN if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then \
 # Tools for building
 RUN apt-get update && apt-get install -y \
     make \
-    llvm-18 \
+    llvm-20 \
     gcc-10 \
     binutils \
     valgrind \
@@ -80,8 +80,8 @@ RUN update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-10 100
 RUN apt-get update && apt-get install -y \
     python3 \
     python3-pip \
-    clang-format-18 \
-    clang-tidy-18
+    clang-format-20 \
+    clang-tidy-20
 
 RUN python3 -m pip install --upgrade pip