[libc++] Bump the version of Clang we use in the CI
authorLouis Dionne <ldionne.2@gmail.com>
Wed, 2 Feb 2022 18:19:27 +0000 (13:19 -0500)
committerLouis Dionne <ldionne.2@gmail.com>
Fri, 4 Feb 2022 22:05:38 +0000 (17:05 -0500)
Differential Revision: https://reviews.llvm.org/D118830

libcxx/utils/ci/Dockerfile

index b271bfb..8715f26 100644 (file)
@@ -54,9 +54,11 @@ RUN printf "fr_CA ISO-8859-1\ncs_CZ ISO-8859-2" >> /usr/local/share/i1en/SUPPORT
 RUN locale-gen
 
 # Install Clang <latest>, <latest-1> and ToT, which are the ones we support.
-ENV LLVM_LATEST_VERSION=13
+# We also install <latest-2> to allow smooth CI transitions around release points.
+ENV LLVM_LATEST_VERSION=14
 RUN apt-get update && apt-get install -y lsb-release wget software-properties-common
 RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh
+RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION - 2)) # for CI transitions
 RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION - 1)) # previous release
 RUN bash /tmp/llvm.sh $LLVM_LATEST_VERSION          # latest release
 RUN bash /tmp/llvm.sh $(($LLVM_LATEST_VERSION + 1)) # current ToT