Skip to content

Commit dcaf7ba

Browse files
committed
better?
1 parent ab88038 commit dcaf7ba

File tree

1 file changed

+6
-3
lines changed
  • .github/workflows/containers/github-action-ci-tooling

1 file changed

+6
-3
lines changed

.github/workflows/containers/github-action-ci-tooling/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM 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

55
RUN 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+
1213
FROM docker.io/library/ubuntu:24.04 AS base
1314

1415
ENV 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
4344
USER gha
4445
WORKDIR /home/gha
4546

47+
4648
FROM base AS ci-container-code-format
4749

4850
COPY --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+
5961
FROM base AS ci-container-code-lint
6062

6163
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy ${LLVM_SYSROOT}/bin/
6264
COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/clang-tidy-diff.py
6365

6466
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
6567

68+
# Install dependencies for 'pr-code-lint.yml' job
6669
COPY llvm/utils/git/requirements_linting.txt /home/gha/requirements_linting.txt
6770
RUN python -m venv venv && \
6871
venv/bin/pip install -r /home/gha/requirements_linting.txt && \

0 commit comments

Comments
 (0)