Skip to content

Commit 167c71a

Browse files
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.
1 parent 249db51 commit 167c71a

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM docker.io/library/ubuntu:22.04 as base
22
ENV LLVM_SYSROOT=/opt/llvm
33

44
FROM base as stage1-toolchain
5-
ENV LLVM_VERSION=17.0.6
5+
ENV LLVM_VERSION=18.1.8
66

77
RUN apt-get update && \
88
apt-get install -y \
@@ -21,11 +21,9 @@ WORKDIR /llvm-project-llvmorg-$LLVM_VERSION
2121

2222
COPY bootstrap.patch /
2323

24-
# TODO(boomanaiden154): Remove the patch pulled from a LLVM PR once we bump
25-
# the toolchain to version 18 and the patch is in-tree.
2624
# TODO(boomanaiden154): Remove the bootstrap patch once we unsplit the build
2725
# and no longer need to explicitly build the stage2 dependencies.
28-
RUN curl https://github.com/llvm/llvm-project/commit/dd0356d741aefa25ece973d6cc4b55dcb73b84b4.patch | patch -p1 && cat /bootstrap.patch | patch -p1
26+
RUN cat /bootstrap.patch | patch -p1
2927

3028
RUN mkdir build
3129

0 commit comments

Comments
 (0)