[llvm-branch-commits] [libcxx] d69fc66 - [libc++] Install git-clang-format on CI nodes.

[Louis Dionne via llvm-branch-commits]

Author: Marek Kurdej
Date: 2020-12-16T16:36:34-05:00
New Revision: d69fc6629d077475b0fa1c2de531c4bf0fda9d67

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

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

Two problems fixed:
* an old version of clang-format get installed by default (6.0).
* git-clang-format is not present, only git-clang-format-<version> (e.g. git-clang-format-6.0).

Solution:
* install clang-format-11 with explicit version
* make symlink git-clang-format to the latest version of git-clang-format-<version>

Differential Revision: https://reviews.llvm.org/D93201

Added: 
    

Modified: 
    libcxx/utils/ci/Dockerfile

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/Dockerfile b/libcxx/utils/ci/Dockerfile
index 6161dd4adefc..c9fe0fd9dd24 100644
--- a/libcxx/utils/ci/Dockerfile
+++ b/libcxx/utils/ci/Dockerfile
@@ -45,8 +45,10 @@ 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 clang-format
+RUN apt-get update && apt-get install -y ninja-build python3 python3-sphinx python3-distutils git gdb clang-format-11
 RUN apt-get update && apt-get install -y libc6-dev-i386 # Required to cross-compile to 32 bits
+# Make a symbolic link to git-clang-format (pointing to git-clang-format-<version>), if it doesn't exist.
+RUN which git-clang-format || $(cd /usr/bin/ && ln -s $(ls git-clang-format-* | sort -rV | head -n 1) git-clang-format)
 
 # Install the most recently released LLVM
 RUN apt-get update && apt-get install -y lsb-release wget software-properties-common