Skip to content

Commit e4022b6

Browse files
committed
[libc++][CI] Uses LLVM 17 in Docker.
Updates the LLVM versions used in the Dockerfile. It also removes obsolete symlinks. This doesn't update the Buildkite jobs, they need to use the new Docker image before they can be updated. Reviewed By: ldionne, #libc, philnik Differential Revision: https://reviews.llvm.org/D143007
1 parent 2398e20 commit e4022b6

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

libcxx/utils/ci/Dockerfile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,31 +58,19 @@ RUN locale-gen
5858
# LLVM 15, we still need to have Clang 12 in this Docker image because the LLVM
5959
# 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12,
6060
# though.
61-
ENV LLVM_HEAD_VERSION=16
61+
ENV LLVM_HEAD_VERSION=17
6262
RUN apt-get update && apt-get install -y lsb-release wget software-properties-common
6363
RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh
6464
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 3)) # for CI transitions
6565
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 2)) # previous release
6666
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 1)) # latest release
6767
RUN bash /tmp/llvm.sh $LLVM_HEAD_VERSION # current ToT
6868

69-
# Make the latest version of Clang the "default" compiler on the system
70-
# TODO: After branching for LLVM 16, all jobs will be using an
71-
# explicitly-versioned version of Clang instead, so we can get rid of
72-
# these symlinks.
73-
RUN ln -fs /usr/bin/clang++-14 /usr/bin/c++ && [ -e $(readlink /usr/bin/c++) ]
74-
RUN ln -fs /usr/bin/clang-14 /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ]
75-
7669
# Install clang-format; always use the lastest stable branch.
77-
# TODO LLVM 16 remove hard-coded version 14 and the symlinks
7870
RUN apt-get update && apt-get install -y clang-format-$(($LLVM_HEAD_VERSION - 2)) clang-format-$(($LLVM_HEAD_VERSION - 1))
79-
RUN ln -s /usr/bin/clang-format-14 /usr/bin/clang-format && [ -e $(readlink /usr/bin/clang-format) ]
80-
RUN ln -s /usr/bin/git-clang-format-14 /usr/bin/git-clang-format && [ -e $(readlink /usr/bin/git-clang-format) ]
8171

8272
# Install clang-tidy
83-
# TODO LLVM 16 remove hard-coded version 14 and the symlink
84-
RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 1)) clang-tidy-$LLVM_HEAD_VERSION clang-tidy-14
85-
RUN ln -s /usr/bin/clang-tidy-14 /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ]
73+
RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 2)) clang-tidy-$((LLVM_HEAD_VERSION - 1))
8674

8775
# Install llvm-dev and libclang-dev to compile custom clang-tidy checks
8876
RUN apt-get update && apt-get install -y llvm-$(($LLVM_HEAD_VERSION - 1))-dev llvm-$(($LLVM_HEAD_VERSION - 2))-dev \

0 commit comments

Comments
 (0)