[libcxx-commits] [libcxx] 648d99e - [libc++] Install clang-tools in the CI container

[Nikolas Klauser via libcxx-commits]

Author: Nikolas Klauser
Date: 2022-08-04T16:42:42+02:00
New Revision: 648d99e7dd21b0ac77637e99c9a3b9e52b53e9aa

URL: https://github.com/llvm/llvm-project/commit/648d99e7dd21b0ac77637e99c9a3b9e52b53e9aa
DIFF: https://github.com/llvm/llvm-project/commit/648d99e7dd21b0ac77637e99c9a3b9e52b53e9aa.diff

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

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

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index f175b705e3b9e..a460ed1e0490d 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -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))