Skip to content

Commit 4ca00a5

Browse files
authored
[libc++] Remove the libc++ specific clang-format job (#67344)
Now that we have a LLVM-wide GitHub action, it doesn't make sense to have a custom job for libc++ in our BuildKite CI pipeline. This only creates confusion as to which CI job should be acted upon.
1 parent a9ea11b commit 4ca00a5

File tree

2 files changed

+1
-40
lines changed

2 files changed

+1
-40
lines changed

libcxx/utils/ci/buildkite-pipeline.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,8 @@ env:
3131
GCC_STABLE_VERSION: "13"
3232
steps:
3333
#
34-
# Light pre-commit tests for things like formatting or when people forget
35-
# to update generated files.
34+
# Light pre-commit tests for things like forgetting to update generated files.
3635
#
37-
- label: "Format"
38-
command: "libcxx/utils/ci/run-buildbot check-format"
39-
artifact_paths:
40-
- "**/clang-format.patch"
41-
env:
42-
GIT_CLANG_FORMAT: "/usr/bin/git-clang-format-${LLVM_STABLE_VERSION} --binary clang-format-${LLVM_STABLE_VERSION}"
43-
CC: "clang-${LLVM_HEAD_VERSION}"
44-
CXX: "clang++-${LLVM_HEAD_VERSION}"
45-
agents:
46-
queue: "libcxx-builders"
47-
os: "linux"
48-
retry:
49-
automatic:
50-
- exit_status: -1 # Agent was lost
51-
limit: 2
52-
timeout_in_minutes: 120
53-
5436
- label: "Generated output"
5537
command: "libcxx/utils/ci/run-buildbot check-generated-output"
5638
artifact_paths:

libcxx/utils/ci/run-buildbot

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ CMAKE The CMake binary to use. This variable is optional.
4444
CLANG_FORMAT The clang-format binary to use when generating the format
4545
ignore list.
4646
47-
GIT_CLANG_FORMAT The git-clang-format binary to use in the 'format' builder.
48-
When the value is omitted, it defaults to
49-
'git-clang-format'. This variable or its fallback must work
50-
when running the 'format' builder.
51-
5247
ENABLE_CLANG_TIDY Whether to compile and run clang-tidy checks. This variable
5348
is optional.
5449
@@ -208,22 +203,6 @@ ${NINJA} --version
208203
if [ ! -z "${CXX}" ]; then ${CXX} --version; fi
209204

210205
case "${BUILDER}" in
211-
check-format)
212-
clean
213-
echo "+++ Checking formatting"
214-
# We need to set --extensions so that clang-format checks extensionless files.
215-
mkdir -p ${BUILD_DIR}
216-
if [ -z "${GIT_CLANG_FORMAT}" ]; then
217-
GIT_CLANG_FORMAT=git-clang-format
218-
fi
219-
${GIT_CLANG_FORMAT} \
220-
--diff \
221-
--extensions ',h,hpp,c,cpp,cppm,inc,ipp' HEAD~1 \
222-
-- $(find libcxx/{benchmarks,include,modules,src} -type f | grep -vf libcxx/utils/data/ignore_format.txt) \
223-
| tee ${BUILD_DIR}/clang-format.patch
224-
# Check if the diff is empty, fail otherwise.
225-
! grep -q '^--- a' ${BUILD_DIR}/clang-format.patch
226-
;;
227206
check-generated-output)
228207
# `! foo` doesn't work properly with `set -e`, use `! foo || false` instead.
229208
# https://stackoverflow.com/questions/57681955/set-e-does-not-respect-logical-not

0 commit comments

Comments
 (0)