[llvm] [WIP][Github][CI] Add separate container for code-format premerge job (PR #161083)
Baranov Victor via llvm-commits
llvm-commits at lists.llvm.org
Fri Oct 3 11:14:53 PDT 2025
https://github.com/vbvictor updated https://github.com/llvm/llvm-project/pull/161083
>From 9f93adcd507ba66b5283a73768dc6e5ed4fd0637 Mon Sep 17 00:00:00 2001
From: baranov-V-V <bar.victor.2002 at gmail.com>
Date: Sun, 28 Sep 2025 17:25:49 +0300
Subject: [PATCH 1/6] [Github][CI] Add separate container for code-format
premerge job
---
.../build-ci-container-code-format.yml | 105 ++++++++++++++++++
.../github-action-ci-code-format/Dockerfile | 77 +++++++++++++
2 files changed, 182 insertions(+)
create mode 100644 .github/workflows/build-ci-container-code-format.yml
create mode 100644 .github/workflows/containers/github-action-ci-code-format/Dockerfile
diff --git a/.github/workflows/build-ci-container-code-format.yml b/.github/workflows/build-ci-container-code-format.yml
new file mode 100644
index 0000000000000..723ebd8a6e252
--- /dev/null
+++ b/.github/workflows/build-ci-container-code-format.yml
@@ -0,0 +1,105 @@
+name: Build CI Container
+
+permissions:
+ contents: read
+
+on:
+ push:
+ branches:
+ - main
+ paths:
+ - .github/workflows/build-ci-container-code-format.yml
+ - '.github/workflows/containers/github-action-ci-code-format/**'
+ - llvm/utils/git/code-format-helper.py
+ - llvm/utils/git/requirements_formatting.txt
+ - llvm/utils/git/requirements_formatting.txt.in
+ pull_request:
+ paths:
+ - .github/workflows/build-ci-container-code-format.yml
+ - '.github/workflows/containers/github-action-ci-code-format/**'
+ - llvm/utils/git/code-format-helper.py
+ - llvm/utils/git/requirements_formatting.txt
+ - llvm/utils/git/requirements_formatting.txt.in
+
+jobs:
+ build-ci-container-code-format:
+ if: github.repository_owner == 'llvm'
+ runs-on: depot-ubuntu-24.04-16
+ steps:
+ - name: Checkout LLVM
+ uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+ with:
+ sparse-checkout: .github/workflows/containers/github-action-ci-code-format/
+ - name: Write Variables
+ id: vars
+ run: |
+ tag=$(git rev-parse --short=12 HEAD)
+ container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/amd64/ci-ubuntu-24.04-code-format"
+ echo "container-name=$container_name" >> $GITHUB_OUTPUT
+ echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT
+ echo "container-filename=$(echo $container_name:$tag | sed -e 's/\//-/g' -e 's/:/-/g').tar" >> $GITHUB_OUTPUT
+ - name: Build container
+ run: |
+ podman build --target ci-container-code-format \
+ -f .github/workflows/containers/github-action-ci-code-format/Dockerfile \
+ -t ${{ steps.vars.outputs.container-name-tag }} .
+
+ # Save the container so we have it in case the push fails. This also
+ # allows us to separate the push step into a different job so we can
+ # maintain minimal permissions while building the container.
+ - name: Save container image
+ run: |
+ podman save ${{ steps.vars.outputs.container-name-tag }} > ${{ steps.vars.outputs.container-filename }}
+
+ - name: Upload container image
+ uses: actions/upload-artifact at 65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+ with:
+ name: container-amd64
+ path: "*.tar"
+ retention-days: 14
+
+ - name: Test Container
+ run: |
+ for image in ${{ steps.vars.outputs.container-name-tag }}; do
+ # Use --pull=never to ensure we are testing the just built image.
+ podman run --pull=never --rm -it $image /usr/bin/bash -x -c 'cd $HOME && clang-format --version | grep version'
+ done
+
+ push-ci-container:
+ if: github.event_name == 'push'
+ needs:
+ - build-ci-container-code-format
+ permissions:
+ packages: write
+ runs-on: ubuntu-24.04
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ steps:
+ - name: Download container
+ uses: actions/download-artifact at 634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+
+ - name: Push Container
+ run: |
+ function push_container {
+ image_name=$1
+ latest_name=$(echo $image_name | sed 's/:[a-f0-9]\+$/:latest/g')
+ podman tag $image_name $latest_name
+ echo "Pushing $image_name ..."
+ podman push $image_name
+ echo "Pushing $latest_name ..."
+ podman push $latest_name
+ }
+
+ podman login -u ${{ github.actor }} -p $GITHUB_TOKEN ghcr.io
+ for f in $(find . -iname *.tar); do
+ image_name=$(podman load -q -i $f | sed 's/Loaded image: //g')
+ push_container $image_name
+
+ if echo $image_name | grep '/amd64/'; then
+ # For amd64, create an alias with the arch component removed.
+ # This matches the convention used on dockerhub.
+ default_image_name=$(echo $(dirname $(dirname $image_name))/$(basename $image_name))
+ podman tag $image_name $default_image_name
+ push_container $default_image_name
+ fi
+ done
diff --git a/.github/workflows/containers/github-action-ci-code-format/Dockerfile b/.github/workflows/containers/github-action-ci-code-format/Dockerfile
new file mode 100644
index 0000000000000..88d43618bd22e
--- /dev/null
+++ b/.github/workflows/containers/github-action-ci-code-format/Dockerfile
@@ -0,0 +1,77 @@
+FROM docker.io/library/ubuntu:24.04 AS base
+ENV LLVM_SYSROOT=/opt/llvm
+
+FROM base AS clang-format-toolchain
+ENV LLVM_VERSION=21.1.1
+
+RUN apt-get update && \
+ apt-get install -y \
+ wget \
+ gcc \
+ g++ \
+ cmake \
+ ninja-build \
+ python3 \
+ git \
+ curl \
+ zlib1g-dev && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists/*
+
+RUN curl -O -L https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$LLVM_VERSION.tar.gz && \
+ tar -xf llvmorg-$LLVM_VERSION.tar.gz && \
+ rm -f llvmorg-$LLVM_VERSION.tar.gz
+
+WORKDIR /llvm-project-llvmorg-$LLVM_VERSION
+
+RUN cmake -B ./build -G Ninja ./llvm \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX="$LLVM_SYSROOT" \
+ -DLLVM_ENABLE_PROJECTS="clang" \
+ -DLLVM_DISTRIBUTION_COMPONENTS="clang-format"
+
+RUN ninja -C ./build install-distribution
+
+FROM base AS ci-container-code-format
+
+COPY --from=clang-format-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
+
+# Need nodejs for some of the GitHub actions.
+# Need git for git-clang-format.
+RUN apt-get update && \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ # binutils \
+ git \
+ nodejs \
+ # python3-psutil \
+ sudo \
+ # These are needed by the premerge pipeline. Pip and venv are used to
+ # install dependent python packages.
+ # Having a symlink from python to python3 enables code sharing between
+ # the Linux and Windows pipelines.
+ python3-pip \
+ python3-venv \
+ python-is-python3 && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists/*
+
+ENV LLVM_SYSROOT=$LLVM_SYSROOT
+ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
+
+# Create a new user to avoid test failures related to a lack of expected
+# permissions issues in some tests. Set the user id to 1001 as that is the
+# user id that Github Actions uses to perform the checkout action.
+RUN useradd gha -u 1001 -m -s /bin/bash
+
+# Also add the user to passwordless sudoers so that we can install software
+# later on without having to rebuild the container.
+RUN adduser gha sudo
+RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+
+USER gha
+WORKDIR /home/gha
+
+COPY llvm/utils/git/requirements_formatting.txt /home/gha/requirements_formatting.txt
+RUN python -m venv venv && \
+ venv/bin/pip install -r /home/gha/requirements_formatting.txt && \
+ rm /home/gha/requirements_formatting.txt
>From df0f99bcf672b9029de38d380d1e696510c0d2aa Mon Sep 17 00:00:00 2001
From: baranov-V-V <bar.victor.2002 at gmail.com>
Date: Sun, 28 Sep 2025 18:06:37 +0300
Subject: [PATCH 2/6] better
---
.github/workflows/build-ci-container-code-format.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build-ci-container-code-format.yml b/.github/workflows/build-ci-container-code-format.yml
index 723ebd8a6e252..885a4b47b4a51 100644
--- a/.github/workflows/build-ci-container-code-format.yml
+++ b/.github/workflows/build-ci-container-code-format.yml
@@ -29,7 +29,10 @@ jobs:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
- sparse-checkout: .github/workflows/containers/github-action-ci-code-format/
+ sparse-checkout: |
+ .github/workflows/containers/github-action-ci-code-format/
+ llvm/utils/git/requirements_formatting.txt
+
- name: Write Variables
id: vars
run: |
>From d7ee503b6e3b8de4f720e0d149b2075c9cac152a Mon Sep 17 00:00:00 2001
From: baranov-V-V <bar.victor.2002 at gmail.com>
Date: Sun, 28 Sep 2025 18:44:08 +0300
Subject: [PATCH 3/6] better
---
.../containers/github-action-ci-code-format/Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/containers/github-action-ci-code-format/Dockerfile b/.github/workflows/containers/github-action-ci-code-format/Dockerfile
index 88d43618bd22e..3ff87bcf563c7 100644
--- a/.github/workflows/containers/github-action-ci-code-format/Dockerfile
+++ b/.github/workflows/containers/github-action-ci-code-format/Dockerfile
@@ -40,10 +40,8 @@ COPY --from=clang-format-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
# Need git for git-clang-format.
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \
- # binutils \
git \
nodejs \
- # python3-psutil \
sudo \
# These are needed by the premerge pipeline. Pip and venv are used to
# install dependent python packages.
@@ -71,6 +69,7 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER gha
WORKDIR /home/gha
+# Install dependencies for 'pr-code-format.yml' job
COPY llvm/utils/git/requirements_formatting.txt /home/gha/requirements_formatting.txt
RUN python -m venv venv && \
venv/bin/pip install -r /home/gha/requirements_formatting.txt && \
>From 8496a1b4f1b340ccaeab6b18141b39d8230e06b1 Mon Sep 17 00:00:00 2001
From: Victor Baranov <bar.victor.2002 at gmail.com>
Date: Fri, 3 Oct 2025 01:31:31 +0300
Subject: [PATCH 4/6] add dockerfile with binary download
---
...mat.yml => build-ci-container-tooling.yml} | 42 +++++++-----
.../Dockerfile | 67 +++++++++----------
2 files changed, 59 insertions(+), 50 deletions(-)
rename .github/workflows/{build-ci-container-code-format.yml => build-ci-container-tooling.yml} (72%)
rename .github/workflows/containers/{github-action-ci-code-format => github-action-ci-tooling}/Dockerfile (56%)
diff --git a/.github/workflows/build-ci-container-code-format.yml b/.github/workflows/build-ci-container-tooling.yml
similarity index 72%
rename from .github/workflows/build-ci-container-code-format.yml
rename to .github/workflows/build-ci-container-tooling.yml
index 885a4b47b4a51..9bf90aa2241bc 100644
--- a/.github/workflows/build-ci-container-code-format.yml
+++ b/.github/workflows/build-ci-container-tooling.yml
@@ -8,43 +8,53 @@ on:
branches:
- main
paths:
- - .github/workflows/build-ci-container-code-format.yml
- - '.github/workflows/containers/github-action-ci-code-format/**'
- - llvm/utils/git/code-format-helper.py
+ - .github/workflows/build-ci-container-tooling.yml
+ - '.github/workflows/containers/github-action-ci-tooling/**'
- llvm/utils/git/requirements_formatting.txt
- - llvm/utils/git/requirements_formatting.txt.in
+ - llvm/utils/git/requirements_linting.txt
pull_request:
paths:
- - .github/workflows/build-ci-container-code-format.yml
- - '.github/workflows/containers/github-action-ci-code-format/**'
- - llvm/utils/git/code-format-helper.py
+ - .github/workflows/build-ci-container-tooling.yml
+ - '.github/workflows/containers/github-action-ci-tooling/**'
- llvm/utils/git/requirements_formatting.txt
- - llvm/utils/git/requirements_formatting.txt.in
+ - llvm/utils/git/requirements_linting.txt
jobs:
- build-ci-container-code-format:
+ build-ci-container-tooling:
if: github.repository_owner == 'llvm'
runs-on: depot-ubuntu-24.04-16
+ strategy:
+ matrix:
+ target: [ci-container-code-format, ci-container-code-lint]
+ include:
+ - target: ci-container-code-format
+ container_name: code-format
+ check_line: clang-format --version | grep version
+ - target: ci-container-code-lint
+ container_name: code-lint
+ check_line: clang-tidy --version | grep version
steps:
- name: Checkout LLVM
uses: actions/checkout at 08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
with:
sparse-checkout: |
- .github/workflows/containers/github-action-ci-code-format/
+ .github/workflows/containers/github-action-ci-tooling/
llvm/utils/git/requirements_formatting.txt
+ llvm/utils/git/requirements_linting.txt
+ clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py
- name: Write Variables
id: vars
run: |
tag=$(git rev-parse --short=12 HEAD)
- container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/amd64/ci-ubuntu-24.04-code-format"
+ container_name="ghcr.io/$GITHUB_REPOSITORY_OWNER/amd64/ci-ubuntu-24.04-${{ matrix.container_name }}"
echo "container-name=$container_name" >> $GITHUB_OUTPUT
echo "container-name-tag=$container_name:$tag" >> $GITHUB_OUTPUT
echo "container-filename=$(echo $container_name:$tag | sed -e 's/\//-/g' -e 's/:/-/g').tar" >> $GITHUB_OUTPUT
- name: Build container
run: |
- podman build --target ci-container-code-format \
- -f .github/workflows/containers/github-action-ci-code-format/Dockerfile \
+ podman build --target ${{ matrix.target }} \
+ -f .github/workflows/containers/github-action-ci-tooling/Dockerfile \
-t ${{ steps.vars.outputs.container-name-tag }} .
# Save the container so we have it in case the push fails. This also
@@ -57,7 +67,7 @@ jobs:
- name: Upload container image
uses: actions/upload-artifact at 65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
with:
- name: container-amd64
+ name: container-amd64-${{ matrix.container_name }}
path: "*.tar"
retention-days: 14
@@ -65,13 +75,13 @@ jobs:
run: |
for image in ${{ steps.vars.outputs.container-name-tag }}; do
# Use --pull=never to ensure we are testing the just built image.
- podman run --pull=never --rm -it $image /usr/bin/bash -x -c 'cd $HOME && clang-format --version | grep version'
+ podman run --pull=never --rm -it $image /usr/bin/bash -x -c 'cd $HOME && ${{ matrix.check_line }}'
done
push-ci-container:
if: github.event_name == 'push'
needs:
- - build-ci-container-code-format
+ - build-ci-container-tooling
permissions:
packages: write
runs-on: ubuntu-24.04
diff --git a/.github/workflows/containers/github-action-ci-code-format/Dockerfile b/.github/workflows/containers/github-action-ci-tooling/Dockerfile
similarity index 56%
rename from .github/workflows/containers/github-action-ci-code-format/Dockerfile
rename to .github/workflows/containers/github-action-ci-tooling/Dockerfile
index 3ff87bcf563c7..b0b9b24def2cd 100644
--- a/.github/workflows/containers/github-action-ci-code-format/Dockerfile
+++ b/.github/workflows/containers/github-action-ci-tooling/Dockerfile
@@ -1,40 +1,18 @@
-FROM docker.io/library/ubuntu:24.04 AS base
-ENV LLVM_SYSROOT=/opt/llvm
+FROM docker.io/library/ubuntu:24.04 AS llvm-downloader
-FROM base AS clang-format-toolchain
-ENV LLVM_VERSION=21.1.1
+ENV LLVM_VERSION=21.1.2
RUN apt-get update && \
- apt-get install -y \
- wget \
- gcc \
- g++ \
- cmake \
- ninja-build \
- python3 \
- git \
- curl \
- zlib1g-dev && \
- apt-get clean && \
- rm -rf /var/lib/apt/lists/*
-
-RUN curl -O -L https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-$LLVM_VERSION.tar.gz && \
- tar -xf llvmorg-$LLVM_VERSION.tar.gz && \
- rm -f llvmorg-$LLVM_VERSION.tar.gz
-
-WORKDIR /llvm-project-llvmorg-$LLVM_VERSION
+ apt-get install -y wget pixz && \
+ wget --progress=bar:force -O llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-Linux-X64.tar.xz && \
+ mkdir -p /llvm-extract && \
+ pixz -d llvm.tar.xz && \
+ tar -xvf llvm.tar -C /llvm-extract LLVM-${LLVM_VERSION}-Linux-X64/bin/ && \
+ rm llvm.tar
-RUN cmake -B ./build -G Ninja ./llvm \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX="$LLVM_SYSROOT" \
- -DLLVM_ENABLE_PROJECTS="clang" \
- -DLLVM_DISTRIBUTION_COMPONENTS="clang-format"
-
-RUN ninja -C ./build install-distribution
-
-FROM base AS ci-container-code-format
+FROM docker.io/library/ubuntu:24.04 AS base
-COPY --from=clang-format-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
+ENV LLVM_SYSROOT=/opt/llvm
# Need nodejs for some of the GitHub actions.
# Need git for git-clang-format.
@@ -53,8 +31,6 @@ RUN apt-get update && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
-ENV LLVM_SYSROOT=$LLVM_SYSROOT
-ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
# Create a new user to avoid test failures related to a lack of expected
# permissions issues in some tests. Set the user id to 1001 as that is the
@@ -69,8 +45,31 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER gha
WORKDIR /home/gha
+FROM base AS ci-container-code-format
+
+ENV LLVM_VERSION=21.1.2
+
+COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-format ${LLVM_SYSROOT}/bin/clang-format
+
+ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
+
# Install dependencies for 'pr-code-format.yml' job
COPY llvm/utils/git/requirements_formatting.txt /home/gha/requirements_formatting.txt
RUN python -m venv venv && \
venv/bin/pip install -r /home/gha/requirements_formatting.txt && \
rm /home/gha/requirements_formatting.txt
+
+# Stage 4: clang-lint container
+FROM base AS ci-container-code-lint
+
+ENV LLVM_VERSION=21.1.2
+
+COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy ${LLVM_SYSROOT}/bin/
+COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/clang-tidy-diff.py
+
+ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
+
+COPY llvm/utils/git/requirements_linting.txt /home/gha/requirements_linting.txt
+RUN python -m venv venv && \
+ venv/bin/pip install -r /home/gha/requirements_linting.txt && \
+ rm /home/gha/requirements_linting.txt
>From ab88038adf9a699b43a3fbe00fae2228c857347a Mon Sep 17 00:00:00 2001
From: Victor Baranov <bar.victor.2002 at gmail.com>
Date: Fri, 3 Oct 2025 21:07:02 +0300
Subject: [PATCH 5/6] better?
---
.../github-action-ci-tooling/Dockerfile | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/containers/github-action-ci-tooling/Dockerfile b/.github/workflows/containers/github-action-ci-tooling/Dockerfile
index b0b9b24def2cd..54cffd4dbc906 100644
--- a/.github/workflows/containers/github-action-ci-tooling/Dockerfile
+++ b/.github/workflows/containers/github-action-ci-tooling/Dockerfile
@@ -3,16 +3,16 @@ FROM docker.io/library/ubuntu:24.04 AS llvm-downloader
ENV LLVM_VERSION=21.1.2
RUN apt-get update && \
- apt-get install -y wget pixz && \
+ apt-get install -y wget xz-utils && \
wget --progress=bar:force -O llvm.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-Linux-X64.tar.xz && \
mkdir -p /llvm-extract && \
- pixz -d llvm.tar.xz && \
- tar -xvf llvm.tar -C /llvm-extract LLVM-${LLVM_VERSION}-Linux-X64/bin/ && \
- rm llvm.tar
+ tar -xvJf llvm.tar.xz -C /llvm-extract LLVM-${LLVM_VERSION}-Linux-X64/bin/ && \
+ rm llvm.tar.xz
FROM docker.io/library/ubuntu:24.04 AS base
ENV LLVM_SYSROOT=/opt/llvm
+ENV LLVM_VERSION=21.1.2
# Need nodejs for some of the GitHub actions.
# Need git for git-clang-format.
@@ -21,10 +21,8 @@ RUN apt-get update && \
git \
nodejs \
sudo \
- # These are needed by the premerge pipeline. Pip and venv are used to
- # install dependent python packages.
- # Having a symlink from python to python3 enables code sharing between
- # the Linux and Windows pipelines.
+ # These are needed by the premerge pipeline.
+ # Pip and venv are used to install dependent python packages.
python3-pip \
python3-venv \
python-is-python3 && \
@@ -47,8 +45,6 @@ WORKDIR /home/gha
FROM base AS ci-container-code-format
-ENV LLVM_VERSION=21.1.2
-
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-format ${LLVM_SYSROOT}/bin/clang-format
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
@@ -62,8 +58,6 @@ RUN python -m venv venv && \
# Stage 4: clang-lint container
FROM base AS ci-container-code-lint
-ENV LLVM_VERSION=21.1.2
-
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy ${LLVM_SYSROOT}/bin/
COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/clang-tidy-diff.py
>From dcaf7ba8da2eb51b815d83a5ccd7a272cb56da58 Mon Sep 17 00:00:00 2001
From: Victor Baranov <bar.victor.2002 at gmail.com>
Date: Fri, 3 Oct 2025 21:14:37 +0300
Subject: [PATCH 6/6] better?
---
.../containers/github-action-ci-tooling/Dockerfile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/containers/github-action-ci-tooling/Dockerfile b/.github/workflows/containers/github-action-ci-tooling/Dockerfile
index 54cffd4dbc906..d3e8c8af3b2c4 100644
--- a/.github/workflows/containers/github-action-ci-tooling/Dockerfile
+++ b/.github/workflows/containers/github-action-ci-tooling/Dockerfile
@@ -1,6 +1,6 @@
FROM docker.io/library/ubuntu:24.04 AS llvm-downloader
-ENV LLVM_VERSION=21.1.2
+ENV LLVM_VERSION=21.1.1
RUN apt-get update && \
apt-get install -y wget xz-utils && \
@@ -9,10 +9,11 @@ RUN apt-get update && \
tar -xvJf llvm.tar.xz -C /llvm-extract LLVM-${LLVM_VERSION}-Linux-X64/bin/ && \
rm llvm.tar.xz
+
FROM docker.io/library/ubuntu:24.04 AS base
ENV LLVM_SYSROOT=/opt/llvm
-ENV LLVM_VERSION=21.1.2
+ENV LLVM_VERSION=21.1.1
# Need nodejs for some of the GitHub actions.
# Need git for git-clang-format.
@@ -43,6 +44,7 @@ RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER gha
WORKDIR /home/gha
+
FROM base AS ci-container-code-format
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-format ${LLVM_SYSROOT}/bin/clang-format
@@ -55,7 +57,7 @@ RUN python -m venv venv && \
venv/bin/pip install -r /home/gha/requirements_formatting.txt && \
rm /home/gha/requirements_formatting.txt
-# Stage 4: clang-lint container
+
FROM base AS ci-container-code-lint
COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/clang-tidy ${LLVM_SYSROOT}/bin/
@@ -63,6 +65,7 @@ COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/cl
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
+# Install dependencies for 'pr-code-lint.yml' job
COPY llvm/utils/git/requirements_linting.txt /home/gha/requirements_linting.txt
RUN python -m venv venv && \
venv/bin/pip install -r /home/gha/requirements_linting.txt && \
More information about the llvm-commits
mailing list