[libcxx-commits] [libcxx] c5dbc28 - [libc++][CI] Upgrades clang-format version used.

[Mark de Wever via libcxx-commits]

Author: Mark de Wever
Date: 2022-12-06T17:32:52+01:00
New Revision: c5dbc28de227962a2a2b12a789b75201c71519f4

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

LOG: [libc++][CI] Upgrades clang-format version used.

The version used is now determined by Buildkite instead of using the
hard-coded version in the Docker image.

Reviewed By: #libc, ldionne

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

Added: 
    

Modified: 
    libcxx/utils/ci/buildkite-pipeline.yml
    libcxx/utils/ci/run-buildbot

Removed: 
    


################################################################################
diff  --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml
index 6a51cddc80609..0ea86362424c6 100644
--- a/libcxx/utils/ci/buildkite-pipeline.yml
+++ b/libcxx/utils/ci/buildkite-pipeline.yml
@@ -23,6 +23,7 @@
 # Theses numbers are available in all runners, making it easier to update the
 # version number.
 env:
+    LLVM_STABLE_VERSION: "15"
     LLVM_HEAD_VERSION: "16"
     GCC_STABLE_VERSION: "12"
 steps:
@@ -34,6 +35,8 @@ steps:
     command: "libcxx/utils/ci/run-buildbot check-format"
     artifact_paths:
       - "**/clang-format.patch"
+    env:
+        GIT_CLANG_FORMAT: "/usr/bin/git-clang-format-${LLVM_STABLE_VERSION}"
     agents:
       queue: "libcxx-builders"
       os: "linux"

diff  --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 99c73fb76ccf6..3fc2e6f030a13 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -156,8 +156,11 @@ check-format)
     echo "+++ Checking formatting"
     # We need to set --extensions so that clang-format checks extensionless files.
     mkdir -p ${BUILD_DIR}
-    git-clang-format \
-        --binary /usr/bin/clang-format --
diff  \
+    if [ -z "${GIT_CLANG_FORMAT}" ]; then
+       GIT_CLANG_FORMAT=git-clang-format
+    fi
+    ${GIT_CLANG_FORMAT} \
+        --
diff  \
         --extensions ',h,hh,hpp,hxx,c,cc,cxx,cpp' HEAD~1 \
         -- \
             libcxx/{benchmarks,include,src,test} \