[libcxx-commits] [libcxx] a27304c - [libc++] Bump the version of Clang we use in the CI

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2022-02-04T17:05:38-05:00
New Revision: a27304c50f769ba5b5241efd31e5401389cb580a

URL: https://github.com/llvm/llvm-project/commit/a27304c50f769ba5b5241efd31e5401389cb580a
DIFF: https://github.com/llvm/llvm-project/commit/a27304c50f769ba5b5241efd31e5401389cb580a.diff

LOG: [libc++] Bump the version of Clang we use in the CI

Differential Revision: https://reviews.llvm.org/D118830

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index b271bfbbd0668..8715f2627ead8 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -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