From 167c71ad860a44f31ea8b6b5accf84a7c52a89ba Mon Sep 17 00:00:00 2001 From: Aiden Grossman Date: Sun, 11 Aug 2024 11:01:15 -0700 Subject: [PATCH] Bump CI container clang version to 18.1.8 (#102803) This patch bumps the CI container LLVM version to 18.1.8. This should've been bumped a while ago, but I just noticed that it was out of date. This also allows us to drop a patch that we manually had to add as it is by default included in v18. --- .../workflows/containers/github-action-ci/stage1.Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/containers/github-action-ci/stage1.Dockerfile b/.github/workflows/containers/github-action-ci/stage1.Dockerfile index 8c6bcf46384105..73828cc05736e6 100644 --- a/.github/workflows/containers/github-action-ci/stage1.Dockerfile +++ b/.github/workflows/containers/github-action-ci/stage1.Dockerfile @@ -2,7 +2,7 @@ FROM docker.io/library/ubuntu:22.04 as base ENV LLVM_SYSROOT=/opt/llvm FROM base as stage1-toolchain -ENV LLVM_VERSION=17.0.6 +ENV LLVM_VERSION=18.1.8 RUN apt-get update && \ apt-get install -y \ @@ -21,11 +21,9 @@ WORKDIR /llvm-project-llvmorg-$LLVM_VERSION COPY bootstrap.patch / -# TODO(boomanaiden154): Remove the patch pulled from a LLVM PR once we bump -# the toolchain to version 18 and the patch is in-tree. # TODO(boomanaiden154): Remove the bootstrap patch once we unsplit the build # and no longer need to explicitly build the stage2 dependencies. -RUN curl https://github.com/llvm/llvm-project/commit/dd0356d741aefa25ece973d6cc4b55dcb73b84b4.patch | patch -p1 && cat /bootstrap.patch | patch -p1 +RUN cat /bootstrap.patch | patch -p1 RUN mkdir build