This is an archive of the discontinued LLVM Phabricator instance.

Differential D156593

[libc++][CI] Update tools in Docker.
ClosedPublic

Authored by Mordante on Jul 29 2023, 5:36 AM.

Details

Reviewers
philnik
Group Reviewers
Restricted Project
Commits
rGec39506cfcc6: [libc++][CI] Update tools in Docker.
Summary

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

Diff Detail

Event Timeline

Mordante created this revision.Jul 29 2023, 5:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 29 2023, 5:36 AM
Herald added a subscriber: arichardson. · View Herald Transcript
Mordante requested review of this revision.Jul 29 2023, 5:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 29 2023, 5:36 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B248990: Diff 545362.Jul 29 2023, 8:23 AM
philnik accepted this revision.Jul 31 2023, 8:19 AM
This revision is now accepted and ready to land.Jul 31 2023, 8:19 AM
Closed by commit rGec39506cfcc6: [libc++][CI] Update tools in Docker. (authored by Mordante). · Explain WhyJul 31 2023, 9:32 AM
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rGec39506cfcc6: [libc++][CI] Update tools in Docker..

Revision Contents

PathSize
libcxx/
utils/
ci/
4 lines

Diff 545706

libcxx/utils/ci/Dockerfile

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines
# Install Clang <latest>, <latest-1> and ToT, which are the ones we support. # Install Clang <latest>, <latest-1> and ToT, which are the ones we support.
# We also install <latest-2> because we need to support the "latest-1" of the # We also install <latest-2> because we need to support the "latest-1" of the
# current LLVM release branch, which is effectively the <latest-2> of the # current LLVM release branch, which is effectively the <latest-2> of the
# tip-of-trunk LLVM. For example, after branching LLVM 14 but before branching # tip-of-trunk LLVM. For example, after branching LLVM 14 but before branching
# LLVM 15, we still need to have Clang 12 in this Docker image because the LLVM # LLVM 15, we still need to have Clang 12 in this Docker image because the LLVM
# 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12, # 14 release branch CI uses it. The tip-of-trunk CI will never use Clang 12,
# though. # though.
# LLVM POST-BRANCH bump version # 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 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 wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 3)) # for CI transitions RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 3)) # for CI transitions
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 2)) # previous release RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 2)) # previous release
RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 1)) # latest release RUN bash /tmp/llvm.sh $(($LLVM_HEAD_VERSION - 1)) # latest release
RUN bash /tmp/llvm.sh $LLVM_HEAD_VERSION # current ToT RUN bash /tmp/llvm.sh $LLVM_HEAD_VERSION # current ToT
# Install clang-scan-deps, which is required to build modules; always all supported versions. # Install clang-scan-deps, which is required to build modules; always all supported versions.
Show All 28 Lines
# Install a recent CMake # Install a recent CMake
RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-linux-x86_64.sh -O /tmp/install-cmake.sh RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-linux-x86_64.sh -O /tmp/install-cmake.sh
RUN bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license RUN bash /tmp/install-cmake.sh --prefix=/usr --exclude-subdir --skip-license
RUN rm /tmp/install-cmake.sh RUN rm /tmp/install-cmake.sh
# Install a newer CMake for modules # 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.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 bash /tmp/install-cmake.sh --prefix=/opt --exclude-subdir --skip-license
RUN rm /tmp/install-cmake.sh RUN rm /tmp/install-cmake.sh
# Change the user to a non-root user, since some of the libc++ tests # 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. # (e.g. filesystem) require running as non-root. Also setup passwordless sudo.
RUN apt-get update && apt-get install -y sudo RUN apt-get update && apt-get install -y sudo
RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers RUN echo "ALL ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
RUN useradd --create-home libcxx-builder RUN useradd --create-home libcxx-builder
Show All 11 Lines