From 27ccfb1a1d43e5f3d2363a5d94cb2075dc1b1037 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Sun, 1 Feb 2026 21:10:54 +0000 Subject: [PATCH] GCovr Latest (#8) also downgrading to llvm 20 to be compatible with gcovr Reviewed-on: https://git.romainboullard.com/BigfootDev/DockerImages/pulls/8 Co-authored-by: Romain BOULLARD Co-committed-by: Romain BOULLARD --- Linux/BigfootBuilder/Dockerfile | 1 - Linux/CPPBuilder/Dockerfile | 25 +++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Linux/BigfootBuilder/Dockerfile b/Linux/BigfootBuilder/Dockerfile index b493932..9d43ad2 100644 --- a/Linux/BigfootBuilder/Dockerfile +++ b/Linux/BigfootBuilder/Dockerfile @@ -8,7 +8,6 @@ ARG CONAN_DEBUG_PROFILE RUN apt-get update \ && apt-get install -y \ - gcovr \ xvfb \ \ # LunarG Vulkan repo (modern keyring method) diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index b80eedd..496d910 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -29,19 +29,19 @@ RUN apt-get update && apt-get install -y \ # Install LLVM 21 && wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \ && chmod +x /tmp/llvm.sh \ - && /tmp/llvm.sh 21 all \ + && /tmp/llvm.sh 20 all \ \ # Symlinks for clang 21 tools - && ln -sf /usr/bin/clang-21 /usr/bin/clang \ - && ln -sf /usr/bin/clang++-21 /usr/bin/clang++ \ - && ln -sf /usr/bin/llvm-profdata-21 /usr/bin/llvm-profdata \ - && ln -sf /usr/bin/llvm-cov-21 /usr/bin/llvm-cov \ - && ln -sf /usr/bin/clang-format-21 /usr/bin/clang-format \ - && ln -sf /usr/bin/clang-tidy-21 /usr/bin/clang-tidy \ - && ln -sf /usr/bin/run-clang-tidy-21 /usr/bin/run-clang-tidy \ - && ln -sf /usr/bin/llvm-ar-21 /usr/bin/llvm-ar \ - && ln -sf /usr/bin/llvm-nm-21 /usr/bin/llvm-nm \ - && ln -sf /usr/bin/llvm-ranlib-21 /usr/bin/llvm-ranlib \ + && ln -sf /usr/bin/clang-20 /usr/bin/clang \ + && ln -sf /usr/bin/clang++-20 /usr/bin/clang++ \ + && ln -sf /usr/bin/llvm-profdata-20 /usr/bin/llvm-profdata \ + && ln -sf /usr/bin/llvm-cov-20 /usr/bin/llvm-cov \ + && ln -sf /usr/bin/clang-format-20 /usr/bin/clang-format \ + && ln -sf /usr/bin/clang-tidy-20 /usr/bin/clang-tidy \ + && ln -sf /usr/bin/run-clang-tidy-20 /usr/bin/run-clang-tidy \ + && ln -sf /usr/bin/llvm-ar-20 /usr/bin/llvm-ar \ + && ln -sf /usr/bin/llvm-nm-20 /usr/bin/llvm-nm \ + && ln -sf /usr/bin/llvm-ranlib-20 /usr/bin/llvm-ranlib \ \ # Reset ccache stats && ccache --zero-stats @@ -53,7 +53,8 @@ RUN VERSION=1.2.0; \ # Install pipx and Conan RUN pipx ensurepath \ - && pipx install conan + && pipx install conan \ + && pipx install gcovr # Build and install mold RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \