This is an archive of the discontinued LLVM Phabricator instance.

Differential D138728

[libc++] Install llvm-dev in the docker image
ClosedPublic

Authored by philnik on Nov 25 2022, 9:25 AM.

Details

Reviewers
ldionne
Mordante
Group Reviewers
Restricted Project
Commits
rGf48f9614536c: [libc++] Install llvm-dev in the docker image
Summary

This is required to compile custom clang-tidy checks

Diff Detail

Unit TestsFailed

TimeTest
1,500,220 mslibcxx CI AIX (32-bit) > ibm-libc++-shared-cfg-in.std/algorithms/alg_modifying_operations/alg_transform::ranges.transform.pass.cpp
1,501,600 mslibcxx CI AIX (64-bit) > ibm-libc++-shared-cfg-in.std/algorithms/alg_modifying_operations/alg_transform::ranges.transform.pass.cpp

Event Timeline

philnik created this revision.Nov 25 2022, 9:25 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 25 2022, 9:25 AM
Herald added a subscriber: arichardson. · View Herald Transcript
philnik requested review of this revision.Nov 25 2022, 9:25 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 25 2022, 9:25 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Mordante added a comment.Nov 25 2022, 9:31 AM

Thanks for working on this!

libcxx/utils/ci/Dockerfile
88

I would prefer to install $(($LLVM_HEAD_VERSION - 1)) add $(($LLVM_HEAD_VERSION - 2)). Then we use released versions of clang-tidy headers instead of the development version. We do the same for clang-tidy itself.

Harbormaster completed remote builds in B199573: Diff 477991.Nov 25 2022, 10:48 AM
philnik updated this revision to Diff 478650.Nov 29 2022, 11:08 AM
philnik marked an inline comment as done.

Address comments

Mordante accepted this revision.Nov 29 2022, 12:01 PM

Thanks LGTM!

This revision is now accepted and ready to land.Nov 29 2022, 12:01 PM
Harbormaster completed remote builds in B200066: Diff 478650.Nov 29 2022, 2:48 PM
This revision was landed with ongoing or failed builds.Nov 29 2022, 3:49 PM
Closed by commit rGf48f9614536c: [libc++] Install llvm-dev in the docker image (authored by philnik). · Explain Why
This revision was automatically updated to reflect the committed changes.
philnik added a commit: rGf48f9614536c: [libc++] Install llvm-dev in the docker image.

Revision Contents

PathSize
libcxx/
utils/
ci/
3 lines

Diff 478650

libcxx/utils/ci/Dockerfile

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines
RUN ln -s /usr/bin/clang-format-14 /usr/bin/clang-format && [ -e $(readlink /usr/bin/clang-format) ] RUN ln -s /usr/bin/clang-format-14 /usr/bin/clang-format && [ -e $(readlink /usr/bin/clang-format) ]
RUN ln -s /usr/bin/git-clang-format-14 /usr/bin/git-clang-format && [ -e $(readlink /usr/bin/git-clang-format) ] RUN ln -s /usr/bin/git-clang-format-14 /usr/bin/git-clang-format && [ -e $(readlink /usr/bin/git-clang-format) ]
# Install clang-tidy # Install clang-tidy
# TODO LLVM 16 remove hard-coded version 14 and the symlink # TODO LLVM 16 remove hard-coded version 14 and the symlink
RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 1)) clang-tidy-$LLVM_HEAD_VERSION clang-tidy-14 RUN apt-get update && apt-get install -y clang-tidy-$(($LLVM_HEAD_VERSION - 1)) clang-tidy-$LLVM_HEAD_VERSION clang-tidy-14
RUN ln -s /usr/bin/clang-tidy-14 /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ] RUN ln -s /usr/bin/clang-tidy-14 /usr/bin/clang-tidy && [ -e $(readlink /usr/bin/clang-tidy) ]
# Install llvm-dev to compile custom clang-tidy checks
RUN apt-get update && apt-get install llvm-$(($LLVM_HEAD_VERSION - 1))-dev llvm-$(($LLVM_HEAD_VERSION - 2))-dev
MordanteUnsubmitted
Done
ReplyInline Actions

I would prefer to install $(($LLVM_HEAD_VERSION - 1)) add $(($LLVM_HEAD_VERSION - 2)). Then we use released versions of clang-tidy headers instead of the development version. We do the same for clang-tidy itself.

Mordante: I would prefer to install `$(($LLVM_HEAD_VERSION - 1))` add `$(($LLVM_HEAD_VERSION - 2))`. Then…
# Install clang-tools # Install clang-tools
RUN apt-get update && apt-get install -y clang-tools-$(($LLVM_HEAD_VERSION - 1)) clang-tools-$LLVM_HEAD_VERSION RUN apt-get update && apt-get install -y clang-tools-$(($LLVM_HEAD_VERSION - 1)) clang-tools-$LLVM_HEAD_VERSION
# 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
Show All 21 Lines