[libc++][CI] Adds a new CMake version in Docker. #71582
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This allows testing the upcoming CMake 3.28 release in the CI. CMake 3.28 will have non-experimental support for C++20 modules. So this would be a better CMake version for the modular builds. The goal is to remove CMake 3.27 from the CI when the builder work properly with 3.28.
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: Mark de Wever (mordante) ChangesThis allows testing the upcoming CMake 3.28 release in the CI. CMake 3.28 will have non-experimental support for C++20 modules. So this would be a better CMake version for the modular builds. The goal is to remove CMake 3.27 from the CI when the builder work properly with 3.28. Full diff: https://github.com/llvm/llvm-project/pull/71582.diff 1 Files Affected:
diff --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 962de84e852ce59..25a42f359cda5c5 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -111,11 +111,16 @@ RUN bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license
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.
+# TODO Remove the duplicated installation when all runtimes can be build with CMake 3.28.
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
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.28.0-rc4/cmake-3.28.0-rc4-linux-x86_64.sh -O /tmp/install-cmake.sh
+RUN mkdir /opt/cmake-3.28
+RUN bash /tmp/install-cmake.sh --prefix=/opt/cmake-3.28 --exclude-subdir --skip-license
+RUN rm /tmp/install-cmake.sh
+
# Change the user to a non-root user, since some of the libc++ tests
# (e.g. filesystem) require running as non-root. Also setup passwordless sudo.
RUN apt-get update && apt-get install -y sudo
|
ldionne
approved these changes
Nov 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows testing the upcoming CMake 3.28 release in the CI. CMake 3.28 will have non-experimental support for C++20 modules. So this would be a better CMake version for the modular builds.
The goal is to remove CMake 3.27 from the CI when the builder work properly with 3.28.