[libcxx-commits] [libcxx] 78205fa - [libc++][Docker] Don't actually start using a newer compiler in the CI

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2022-02-04T17:17:17-05:00
New Revision: 78205faf54d336c1ca86ceb8bbcf86188feec2f6

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

LOG: [libc++][Docker] Don't actually start using a newer compiler in the CI

To ensure a smooth transition without breaking CI, we should use explicitly
versioned Clangs in the CI jobs definition instead, since that's a change
we can actually test in the CI.

So instead of bumping the compiler version from the Docker image, use
the same version as before by default, and we can bump it from the CI
job definition once all the nodes are running the new image.

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 8715f2627ead8..32fed841aad6f 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -63,9 +63,11 @@ 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
 
-# Make the ToT Clang the "default" compiler on the system
-RUN ln -fs /usr/bin/clang++-$(($LLVM_LATEST_VERSION + 1)) /usr/bin/c++ && [ -e $(readlink /usr/bin/c++) ]
-RUN ln -fs /usr/bin/clang-$(($LLVM_LATEST_VERSION + 1)) /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ]
+# Make the latest version of Clang the "default" compiler on the system
+# TODO: In the future, all jobs should be using an explicitly-versioned version of Clang instead,
+#       and we can get rid of this entirely.
+RUN ln -fs /usr/bin/clang++-$LLVM_LATEST_VERSION /usr/bin/c++ && [ -e $(readlink /usr/bin/c++) ]
+RUN ln -fs /usr/bin/clang-$LLVM_LATEST_VERSION /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ]
 
 # Install clang-format
 RUN apt-get install -y clang-format-$LLVM_LATEST_VERSION