This is an archive of the discontinued LLVM Phabricator instance.

Differential D130845

[libc++] Install clang-tools in the CI container
ClosedPublic

Authored by philnik on Jul 31 2022, 8:06 AM.

Details

Reviewers
ldionne
Mordante
Group Reviewers
Restricted Project
Commits
rG648d99e7dd21: [libc++] Install clang-tools in the CI container
Summary

This is required for using clang-query in the CI

Diff Detail

Event Timeline

philnik created this revision.Jul 31 2022, 8:06 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 31 2022, 8:06 AM
Herald added a subscriber: arichardson. · View Herald Transcript
philnik requested review of this revision.Jul 31 2022, 8:06 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 31 2022, 8:06 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B178455: Diff 448863.Jul 31 2022, 11:12 AM
Mordante accepted this revision.Aug 2 2022, 10:48 AM

LGTM modulo one nit.

libcxx/utils/ci/Dockerfile
84

In Docker you always need to update since the update in the previous layer might be outdated.

While you're at it can you also fix clang-tidy and clang-format above?

This revision is now accepted and ready to land.Aug 2 2022, 10:48 AM
philnik updated this revision to Diff 449704.Aug 3 2022, 10:35 AM
philnik marked an inline comment as done.
  • Address comments
Harbormaster completed remote builds in B179058: Diff 449704.Aug 3 2022, 4:39 PM
Closed by commit rG648d99e7dd21: [libc++] Install clang-tools in the CI container (authored by philnik). · Explain WhyAug 4 2022, 7:43 AM
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rG648d99e7dd21: [libc++] Install clang-tools in the CI container.
ldionne added a comment.Aug 4 2022, 9:19 AM

Thanks for updating this. Next time, make sure to ping me so I can update the Docker image on dockerhub (so the bots can pick it up).

Revision Contents

PathSize
libcxx/
utils/
ci/
8 lines

Diff 449984

libcxx/utils/ci/Dockerfile

Show First 20 Lines • Show All 66 Lines • ▼ Show 20 Lines
# Make the latest version of Clang the "default" compiler on the system # 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, # TODO: In the future, all jobs should be using an explicitly-versioned version of Clang instead,
# and we can get rid of this entirely. # 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/c++ && [ -e $(readlink /usr/bin/c++) ]
RUN ln -fs /usr/bin/clang-$LLVM_LATEST_VERSION /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ] RUN ln -fs /usr/bin/clang-$LLVM_LATEST_VERSION /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ]
# Install clang-format # Install clang-format
RUN apt-get install -y clang-format-$LLVM_LATEST_VERSION RUN apt-get update && apt-get install -y clang-format-$LLVM_LATEST_VERSION
RUN ln -s /usr/bin/clang-format-$LLVM_LATEST_VERSION /usr/bin/clang-format && [ -e $(readlink /usr/bin/clang-format) ] RUN ln -s /usr/bin/clang-format-$LLVM_LATEST_VERSION /usr/bin/clang-format && [ -e $(readlink /usr/bin/clang-format) ]
RUN ln -s /usr/bin/git-clang-format-$LLVM_LATEST_VERSION /usr/bin/git-clang-format && [ -e $(readlink /usr/bin/git-clang-format) ] RUN ln -s /usr/bin/git-clang-format-$LLVM_LATEST_VERSION /usr/bin/git-clang-format && [ -e $(readlink /usr/bin/git-clang-format) ]
# Install clang-tidy # Install clang-tidy
RUN apt-get install -y clang-tidy-$LLVM_LATEST_VERSION RUN apt-get update && apt-get install -y clang-tidy-$LLVM_LATEST_VERSION
RUN ln -s /usr/bin/clang-tidy-$LLVM_LATEST_VERSION /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ] RUN ln -s /usr/bin/clang-tidy-$LLVM_LATEST_VERSION /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ]
# Install clang-tools
RUN apt-get update && apt-get install -y clang-tools-$LLVM_LATEST_VERSION
MordanteUnsubmitted
Done
ReplyInline Actions
# Install clang-tools
- RUN apt-get install -y clang-tools-$LLVM_LATEST_VERSION
+ RUN apt-get update && apt-get install -y clang-tools-$LLVM_LATEST_VERSION
RUN ln -s /usr/bin/clang-query-$LLVM_LATEST_VERSION /usr/bin/clang-query && [ -e $(readlink /usr/bin/clang-query) ]

In Docker you always need to update since the update in the previous layer might be outdated.

While you're at it can you also fix clang-tidy and clang-format above?

Mordante: In Docker you always need to update since the update in the previous layer might be outdated.
RUN ln -s /usr/bin/clang-query-$LLVM_LATEST_VERSION /usr/bin/clang-query && [ -e $(readlink /usr/bin/clang-query) ]
# Install the most recent GCC, like clang install the previous version as a transition. # Install the most recent GCC, like clang install the previous version as a transition.
ENV GCC_LATEST_VERSION=12 ENV GCC_LATEST_VERSION=12
RUN apt-get update && apt install -y gcc-$((GCC_LATEST_VERSION - 1)) g++-$((GCC_LATEST_VERSION - 1)) RUN apt-get update && apt install -y gcc-$((GCC_LATEST_VERSION - 1)) g++-$((GCC_LATEST_VERSION - 1))
RUN apt-get update && apt install -y gcc-$GCC_LATEST_VERSION g++-$GCC_LATEST_VERSION RUN apt-get update && apt install -y gcc-$GCC_LATEST_VERSION g++-$GCC_LATEST_VERSION
# 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
Show All 18 Lines