Skip to content

Commit 3d131f9

Browse files
authored
[libc++][CI] Adds a new CMake version in Docker. (#71582)
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.
1 parent 7cc72a0 commit 3d131f9

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

libcxx/utils/ci/Dockerfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,16 @@ RUN bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license
111111
RUN rm /tmp/install-cmake.sh
112112

113113
# Install a newer CMake for modules
114-
# TODO Remove the duplicated installation when all runtimes can be build with CMake 3.27.
114+
# TODO Remove the duplicated installation when all runtimes can be build with CMake 3.28.
115115
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
116116
RUN bash /tmp/install-cmake.sh --prefix=/opt --exclude-subdir --skip-license
117117
RUN rm /tmp/install-cmake.sh
118118

119+
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
120+
RUN mkdir /opt/cmake-3.28
121+
RUN bash /tmp/install-cmake.sh --prefix=/opt/cmake-3.28 --exclude-subdir --skip-license
122+
RUN rm /tmp/install-cmake.sh
123+
119124
# Change the user to a non-root user, since some of the libc++ tests
120125
# (e.g. filesystem) require running as non-root. Also setup passwordless sudo.
121126
RUN apt-get update && apt-get install -y sudo

0 commit comments

Comments
 (0)