GCovr Latest #8

Merged
rboullard merged 2 commits from gcovr into main 2026-02-01 21:10:55 +00:00
2 changed files with 13 additions and 13 deletions

View File

@@ -8,7 +8,6 @@ ARG CONAN_DEBUG_PROFILE
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y \ && apt-get install -y \
gcovr \
xvfb \ xvfb \
\ \
# LunarG Vulkan repo (modern keyring method) # LunarG Vulkan repo (modern keyring method)

View File

@@ -29,19 +29,19 @@ RUN apt-get update && apt-get install -y \
# Install LLVM 21 # Install LLVM 21
&& wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \ && wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \
&& chmod +x /tmp/llvm.sh \ && chmod +x /tmp/llvm.sh \
&& /tmp/llvm.sh 21 all \ && /tmp/llvm.sh 20 all \
\ \
# Symlinks for clang 21 tools # Symlinks for clang 21 tools
&& ln -sf /usr/bin/clang-21 /usr/bin/clang \ && ln -sf /usr/bin/clang-20 /usr/bin/clang \
&& ln -sf /usr/bin/clang++-21 /usr/bin/clang++ \ && ln -sf /usr/bin/clang++-20 /usr/bin/clang++ \
&& ln -sf /usr/bin/llvm-profdata-21 /usr/bin/llvm-profdata \ && ln -sf /usr/bin/llvm-profdata-20 /usr/bin/llvm-profdata \
&& ln -sf /usr/bin/llvm-cov-21 /usr/bin/llvm-cov \ && ln -sf /usr/bin/llvm-cov-20 /usr/bin/llvm-cov \
&& ln -sf /usr/bin/clang-format-21 /usr/bin/clang-format \ && ln -sf /usr/bin/clang-format-20 /usr/bin/clang-format \
&& ln -sf /usr/bin/clang-tidy-21 /usr/bin/clang-tidy \ && ln -sf /usr/bin/clang-tidy-20 /usr/bin/clang-tidy \
&& ln -sf /usr/bin/run-clang-tidy-21 /usr/bin/run-clang-tidy \ && ln -sf /usr/bin/run-clang-tidy-20 /usr/bin/run-clang-tidy \
&& ln -sf /usr/bin/llvm-ar-21 /usr/bin/llvm-ar \ && ln -sf /usr/bin/llvm-ar-20 /usr/bin/llvm-ar \
&& ln -sf /usr/bin/llvm-nm-21 /usr/bin/llvm-nm \ && ln -sf /usr/bin/llvm-nm-20 /usr/bin/llvm-nm \
&& ln -sf /usr/bin/llvm-ranlib-21 /usr/bin/llvm-ranlib \ && ln -sf /usr/bin/llvm-ranlib-20 /usr/bin/llvm-ranlib \
\ \
# Reset ccache stats # Reset ccache stats
&& ccache --zero-stats && ccache --zero-stats
@@ -53,7 +53,8 @@ RUN VERSION=1.2.0; \
# Install pipx and Conan # Install pipx and Conan
RUN pipx ensurepath \ RUN pipx ensurepath \
&& pipx install conan && pipx install conan \
&& pipx install gcovr
# Build and install mold # Build and install mold
RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \ RUN git clone --branch v2.40.4 https://github.com/rui314/mold.git /tmp/mold \