Skip to content

Commit f5310c2

Browse files
boomanaiden154mgehre-amd
authored andcommitted
[Github] Add some additional system packages (llvm#119988)
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.
1 parent c8e4d87 commit f5310c2

File tree

1 file changed

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

1 file changed

+11
-3
lines changed

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

+11-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ RUN ninja -C ./build stage2-clang-bolt stage2-install-distribution && ninja -C .
4141
FROM base
4242

4343
COPY --from=stage1-toolchain $LLVM_SYSROOT $LLVM_SYSROOT
44-
44+
4545
# Need to install curl for hendrikmuhs/ccache-action
4646
# Need nodejs for some of the GitHub actions.
4747
# Need perl-modules for clang analyzer tests.
4848
# Need git for SPIRV-Tools tests.
4949
RUN apt-get update && \
50-
apt-get install -y \
50+
DEBIAN_FRONTEND=noninteractive apt-get install -y \
5151
binutils \
5252
cmake \
5353
curl \
@@ -56,7 +56,15 @@ RUN apt-get update && \
5656
ninja-build \
5757
nodejs \
5858
perl-modules \
59-
python3-psutil
59+
python3-psutil \
60+
61+
# These are needed by the premerge pipeline. Pip is used to install
62+
# dependent python packages and ccache is used for build caching. File and
63+
# tzdata are used for tests.
64+
python3-pip \
65+
ccache \
66+
file \
67+
tzdata
6068

6169
ENV LLVM_SYSROOT=$LLVM_SYSROOT
6270
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}

0 commit comments

Comments
 (0)