Skip to content

Commit dc1bfbc

Browse files
authored
[clang][ci] Remove unnecessary BuildKite jobs for Clang (#93233)
1. Remove the format-checking job from the BuildKite pipeline. We now have a monorepo-wide format checker implemented with Github Actions, so that should not be necessary anymore. 2. Stop building and testing Clang on Windows via the clang-ci pipeline. We already do that in the github-pull-requests pipeline, so that's just duplicate work. 3. Stop testing Clang on Linux in the clang-ci pipeline. We already do that in the github-pull-requests pipeline too, so that's also duplicate work. For now we still build Clang because the other jobs in the clang-ci pipeline require its artifacts, but that could be improved.
1 parent faa0bd3 commit dc1bfbc

File tree

2 files changed

+5
-51
lines changed

2 files changed

+5
-51
lines changed

clang/utils/ci/buildkite-pipeline.yml

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,7 @@ env:
1717
# LLVM RELEASE bump version
1818
LLVM_HEAD_VERSION: "17"
1919
steps:
20-
- label: "Format"
21-
commands:
22-
- "clang/utils/ci/run-buildbot check-format"
23-
agents:
24-
queue: "linux"
25-
retry:
26-
automatic:
27-
- exit_status: -1 # Agent was lost
28-
limit: 2
29-
timeout_in_minutes: 120
30-
31-
- label: "Building and testing clang (Linux)"
20+
- label: "Building Clang (Linux)"
3221
commands:
3322
- "clang/utils/ci/run-buildbot build-clang"
3423
agents:
@@ -39,21 +28,9 @@ steps:
3928
limit: 2
4029
timeout_in_minutes: 120
4130

42-
- label: "Building and testing clang (Windows)"
43-
commands:
44-
- "C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64"
45-
- "bash clang/utils/ci/run-buildbot build-clang-windows"
46-
agents:
47-
queue: "windows"
48-
retry:
49-
automatic:
50-
- exit_status: -1 # Agent was lost
51-
limit: 2
52-
timeout_in_minutes: 120
53-
5431
- wait
5532

56-
- label: "Running libc++ test suite in C++03"
33+
- label: "Testing libc++ with just-built Clang (C++03)"
5734
commands:
5835
- "clang/utils/ci/run-buildbot generic-cxx03"
5936
artifact_paths:
@@ -70,7 +47,7 @@ steps:
7047
limit: 2
7148
timeout_in_minutes: 120
7249

73-
- label: "Running libc++ test suite in C++26"
50+
- label: "Testing libc++ with just-built Clang (C++26)"
7451
commands:
7552
- "clang/utils/ci/run-buildbot generic-cxx26"
7653
artifact_paths:
@@ -87,7 +64,7 @@ steps:
8764
limit: 2
8865
timeout_in_minutes: 120
8966

90-
- label: "Running libc++ test suite with Clang Modules"
67+
- label: "Testing libc++ with just-built Clang (w/ Clang Modules)"
9168
commands:
9269
- "clang/utils/ci/run-buildbot generic-modules"
9370
artifact_paths:

clang/utils/ci/run-buildbot

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ cmake --version
6969
ninja --version
7070

7171
case "${BUILDER}" in
72-
check-format)
73-
echo "*** Checking for trailing whitespace left in Clang source files ***"
74-
if grep -rnI '[[:blank:]]$' clang/lib clang/include clang/docs; then
75-
echo "*** Trailing whitespace has been found in Clang source files as described above ***"
76-
exit 1
77-
fi
78-
;;
7972
build-clang)
8073
mkdir install
8174
# We use Release here to avoid including debug information. Otherwise, the
@@ -90,29 +83,13 @@ build-clang)
9083
-DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \
9184
-DCMAKE_BUILD_TYPE=Release \
9285
-DCMAKE_INSTALL_PREFIX=install \
86+
-DLLVM_TARGETS_TO_BUILD=Native \
9387
-DLLVM_ENABLE_PROJECTS="clang;compiler-rt" \
9488

9589
ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
9690
ccache -s
9791
tar -cJvf install.tar.xz install/
9892
buildkite-agent artifact upload --debug install.tar.xz
99-
100-
ninja -C ${BUILD_DIR} check-clang
101-
;;
102-
build-clang-windows)
103-
cmake -S llvm -B ${BUILD_DIR} -G Ninja \
104-
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
105-
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
106-
-D CMAKE_BUILD_TYPE=Release \
107-
-D CMAKE_INSTALL_PREFIX=install-windows \
108-
-D LLVM_ENABLE_PROJECTS="clang;compiler-rt" \
109-
-D LLVM_ENABLE_ASSERTIONS=ON \
110-
-D LLVM_BUILD_EXAMPLES=ON \
111-
-D COMPILER_RT_BUILD_LIBFUZZER=OFF \
112-
-D COMPILER_RT_BUILD_ORC=OFF
113-
114-
ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
115-
ninja -C ${BUILD_DIR} check-clang
11693
;;
11794
generic-cxx03)
11895
buildkite-agent artifact download install.tar.xz .

0 commit comments

Comments
 (0)