@@ -58,31 +58,19 @@ RUN locale-gen
58
58
# LLVM 15, we still need to have Clang 12 in this Docker image because the LLVM
59
59
# 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12,
60
60
# though.
61
- ENV LLVM_HEAD_VERSION=16
61
+ ENV LLVM_HEAD_VERSION=17
62
62
RUN apt-get update && apt-get install -y lsb-release wget software-properties-common
63
63
RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh
64
64
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 3)) # for CI transitions
65
65
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 2)) # previous release
66
66
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 1)) # latest release
67
67
RUN bash /tmp/llvm.sh $LLVM_HEAD_VERSION # current ToT
68
68
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
-
76
69
# Install clang-format; always use the lastest stable branch.
77
- # TODO LLVM 16 remove hard-coded version 14 and the symlinks
78
70
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) ]
81
71
82
72
# 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))
86
74
87
75
# Install llvm-dev and libclang-dev to compile custom clang-tidy checks
88
76
RUN apt-get update && apt-get install -y llvm-$(($LLVM_HEAD_VERSION - 1))-dev llvm-$(($LLVM_HEAD_VERSION - 2))-dev \
0 commit comments