[llvm] [Github] Add some additional system packages (PR #119988)
Aiden Grossman via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 16 12:29:58 PST 2024
https://github.com/boomanaiden154 updated https://github.com/llvm/llvm-project/pull/119988
>From 9a23855b31656460497b557cbf3a8befc6b2b655 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Sat, 14 Dec 2024 22:34:55 +0000
Subject: [PATCH 1/2] [Github] Add some additional system packages
This patch adds some additional system packages to the CI container. These
are necessary for use in the new premerge workflows. The size increase is
not super small, but should be manageable with the size increase being about
100MB.
---
.../workflows/containers/github-action-ci/Dockerfile | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/containers/github-action-ci/Dockerfile b/.github/workflows/containers/github-action-ci/Dockerfile
index da11803cad1042..67bc5b2b0909e7 100644
--- a/.github/workflows/containers/github-action-ci/Dockerfile
+++ b/.github/workflows/containers/github-action-ci/Dockerfile
@@ -41,13 +41,13 @@ RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C .
FROM base
COPY --from=stage1-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
-
+
# Need to install curl for hendrikmuhs/ccache-action
# Need nodejs for some of the GitHub actions.
# Need perl-modules for clang analyzer tests.
# Need git for SPIRV-Tools tests.
RUN apt-get update && \
- apt-get install -y \
+ DEBIAN_FRONTEND=noninteractive apt-get install -y \
binutils \
cmake \
curl \
@@ -56,7 +56,11 @@ RUN apt-get update && \
ninja-build \
nodejs \
perl-modules \
- python3-psutil
+ python3-psutil \
+ python3-pip \
+ ccache \
+ file \
+ tzdata
ENV LLVM_SYSROOT=$LLVM_SYSROOT
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
>From f8d0cdd126e96062785a6d4c0842b231801842ea Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Mon, 16 Dec 2024 20:29:47 +0000
Subject: [PATCH 2/2] Add comments
---
.github/workflows/containers/github-action-ci/Dockerfile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/containers/github-action-ci/Dockerfile b/.github/workflows/containers/github-action-ci/Dockerfile
index 67bc5b2b0909e7..ee827ad8a9593c 100644
--- a/.github/workflows/containers/github-action-ci/Dockerfile
+++ b/.github/workflows/containers/github-action-ci/Dockerfile
@@ -57,6 +57,10 @@ RUN apt-get update && \
nodejs \
perl-modules \
python3-psutil \
+
+ # These are needed by the premerge pipeline. Pip is used to install
+ # dependent python packages and ccache is used for build caching. File and
+ # tzdata are used for tests.
python3-pip \
ccache \
file \
More information about the llvm-commits
mailing list