Skip to content

Commit

Permalink
[libc++] Install clang-tools in the CI container
Browse files Browse the repository at this point in the history
This is required for using clang-query in the CI

Reviewed By: Mordante, #libc

Spies: libcxx-commits, arichardson

Differential Revision: https://reviews.llvm.org/D130845
  • Loading branch information
philnik777 committed Aug 4, 2022
1 parent 2138c90 commit 648d99e
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions libcxx/utils/ci/Dockerfile
Expand Up @@ -72,14 +72,18 @@ RUN ln -fs /usr/bin/clang++-$LLVM_LATEST_VERSION /usr/bin/c++ && [ -e $(readlink
RUN ln -fs /usr/bin/clang-$LLVM_LATEST_VERSION /usr/bin/cc && [ -e $(readlink /usr/bin/cc) ]

# 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/git-clang-format-$LLVM_LATEST_VERSION /usr/bin/git-clang-format && [ -e $(readlink /usr/bin/git-clang-format) ]

# 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) ]

# Install clang-tools
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) ]

# Install the most recent GCC, like clang install the previous version as a transition.
ENV GCC_LATEST_VERSION=12
RUN apt-get update && apt install -y gcc-$((GCC_LATEST_VERSION - 1)) g++-$((GCC_LATEST_VERSION - 1))
Expand Down

0 comments on commit 648d99e

Please sign in to comment.