[llvm-branch-commits] [libcxx] 202df68 - [libc++] Install clang-format on CI nodes

[Louis Dionne via llvm-branch-commits]

Author: Louis Dionne
Date: 2020-12-11T14:06:42-05:00
New Revision: 202df6870ea2ac883ac64fab8e01c836da86978b

URL: https://github.com/llvm/llvm-project/commit/202df6870ea2ac883ac64fab8e01c836da86978b
DIFF: https://github.com/llvm/llvm-project/commit/202df6870ea2ac883ac64fab8e01c836da86978b.diff

LOG: [libc++] Install clang-format on CI nodes

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile
    libcxx/utils/ci/macos-ci-setup

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index ea9856d950eb..c7f8a323b507 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -45,7 +45,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y bash curl
 
 # Install various tools used by the build or the test suite
-RUN apt-get update && apt-get install -y ninja-build python3 python3-sphinx python3-distutils git gdb
+RUN apt-get update && apt-get install -y ninja-build python3 python3-sphinx python3-distutils git gdb clang-format
 RUN apt-get update && apt-get install -y libc6-dev-i386 # Required to cross-compile to 32 bits
 
 # Install the most recently released LLVM

diff  --git a/libcxx/utils/ci/macos-ci-setup b/libcxx/utils/ci/macos-ci-setup
index fbd596c10fa8..97d814cd46e9 100755
--- a/libcxx/utils/ci/macos-ci-setup
+++ b/libcxx/utils/ci/macos-ci-setup
@@ -10,7 +10,7 @@ source secrets.env
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 
 # Install the required tools to run CI
-brew install sphinx-doc python3 ninja cmake buildkite/buildkite/buildkite-agent
+brew install sphinx-doc python3 ninja cmake clang-format buildkite/buildkite/buildkite-agent
 
 CFG_DIR="$(brew --prefix)/etc/buildkite-agent"