Skip to content

Commit

Permalink
Bump CI container clang version to 18.1.8 (llvm#102803)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
boomanaiden154 authored and bwendling committed Aug 15, 2024
1 parent 651bae1 commit e0d2fbe
Showing 1 changed file with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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

Expand Down

0 comments on commit e0d2fbe

Please sign in to comment.