Skip to content

Commit 71550ff

Browse files
authored
[GitHub][CI] Move PATH setting into base image for tooling containers (#166826)
This eliminate some redundant code.
1 parent d2f75f2 commit 71550ff

File tree

1 file changed

+1
-2
lines changed
  • .github/workflows/containers/github-action-ci-tooling

1 file changed

+1
-2
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN apt-get update && \
2222

2323
FROM docker.io/library/ubuntu:24.04 AS base
2424
ENV LLVM_SYSROOT=/opt/llvm
25+
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
2526

2627
# Need nodejs for some of the GitHub actions.
2728
# Need git for git-clang-format.
@@ -53,7 +54,6 @@ COPY --from=llvm-downloader /llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/cla
5354
/llvm-extract/LLVM-${LLVM_VERSION}-Linux-X64/bin/git-clang-format \
5455
${LLVM_SYSROOT}/bin/
5556

56-
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
5757

5858
# Install dependencies for 'pr-code-format.yml' job
5959
COPY llvm/utils/git/requirements_formatting.txt requirements_formatting.txt
@@ -77,7 +77,6 @@ COPY clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py ${LLVM_SYSROOT}/bin/cl
7777
RUN ln -s ${LLVM_SYSROOT}/bin/clang-${LLVM_VERSION_MAJOR} ${LLVM_SYSROOT}/bin/clang && \
7878
ln -s ${LLVM_SYSROOT}/bin/clang ${LLVM_SYSROOT}/bin/clang++
7979

80-
ENV PATH=${LLVM_SYSROOT}/bin:${PATH}
8180

8281
RUN apt-get update && \
8382
DEBIAN_FRONTEND=noninteractive apt-get install -y \

0 commit comments

Comments
 (0)