[libcxx-commits] [libcxx] ec39506 - [libc++][CI] Update tools in Docker.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2023-07-31T18:32:08+02:00
New Revision: ec39506cfcc6288d71ec7e863ffa88a449cca788

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

LOG: [libc++][CI] Update tools in Docker.

Switch to LLVM-18 as ToT version.
Use the latest official CMake 3.27 release.

Reviewed By: #libc, philnik

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

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index a7a3eed179032d..35f03b90c03d99 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -67,7 +67,7 @@ RUN locale-gen
 # 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12,
 # though.
 # LLVM POST-BRANCH bump version
-ENV LLVM_HEAD_VERSION=17
+ENV LLVM_HEAD_VERSION=18
 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_HEAD_VERSION - 3)) # for CI transitions
@@ -112,7 +112,7 @@ RUN rm /tmp/install-cmake.sh
 
 # Install a newer CMake for modules
 # TODO Remove the duplicated installation when all runtimes can be build with CMake 3.27.
-RUN wget https://github.com/Kitware/CMake/releases/download/v3.27.0-rc2/cmake-3.27.0-rc2-linux-x86_64.sh -O /tmp/install-cmake.sh
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-x86_64.sh -O /tmp/install-cmake.sh
 RUN bash /tmp/install-cmake.sh --prefix=/opt --exclude-subdir --skip-license
 RUN rm /tmp/install-cmake.sh