11FROM docker.io/library/ubuntu:24.04 AS llvm-downloader
22
3- ENV LLVM_VERSION=21.1.2
3+ ENV LLVM_VERSION=21.1.1
44
55RUN apt-get update && \
66 apt-get install -y wget xz-utils && \
@@ -9,10 +9,11 @@ RUN apt-get update && \
99 tar -xvJf llvm.tar.xz -C /llvm-extract LLVM-${LLVM_VERSION}-Linux-X64/bin/ && \
1010 rm llvm.tar.xz
1111
12+
1213FROM docker.io/library/ubuntu:24.04 AS base
1314
1415ENV LLVM_SYSROOT=/opt/llvm
15- ENV LLVM_VERSION=21.1.2
16+ ENV LLVM_VERSION=21.1.1
1617
1718# Need nodejs for some of the GitHub actions.
1819# Need git for git-clang-format.
@@ -43,6 +44,7 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
4344USER gha
4445WORKDIR /home/gha
4546
47+
4648FROM base AS ci-container-code-format
4749
4850COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-format ${LLVM_SYSROOT}/bin/clang-format
@@ -55,14 +57,15 @@ RUN python -m venv venv && \
5557 venv/bin/pip install -r /home/gha/requirements_formatting.txt && \
5658 rm /home/gha/requirements_formatting.txt
5759
58- # Stage 4: clang-lint container
60+
5961FROM base AS ci-container-code-lint
6062
6163COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy ${LLVM_SYSROOT}/bin/
6264COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/clang-tidy-diff.py
6365
6466ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
6567
68+ # Install dependencies for 'pr-code-lint.yml' job
6669COPY llvm/utils/git/requirements_linting.txt /home/gha/requirements_linting.txt
6770RUN python -m venv venv && \
6871 venv/bin/pip install -r /home/gha/requirements_linting.txt && \
0 commit comments