Skip to content

[clang][ci] Remove unnecessary BuildKite jobs for Clang #93233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 4 additions & 27 deletions clang/utils/ci/buildkite-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,7 @@ env:
# LLVM RELEASE bump version
LLVM_HEAD_VERSION: "17"
steps:
- label: "Format"
commands:
- "clang/utils/ci/run-buildbot check-format"
agents:
queue: "linux"
retry:
automatic:
- exit_status: -1 # Agent was lost
limit: 2
timeout_in_minutes: 120

- label: "Building and testing clang (Linux)"
- label: "Building Clang (Linux)"
commands:
- "clang/utils/ci/run-buildbot build-clang"
agents:
Expand All @@ -39,21 +28,9 @@ steps:
limit: 2
timeout_in_minutes: 120

- label: "Building and testing clang (Windows)"
commands:
- "C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat -arch=amd64 -host_arch=amd64"
- "bash clang/utils/ci/run-buildbot build-clang-windows"
agents:
queue: "windows"
retry:
automatic:
- exit_status: -1 # Agent was lost
limit: 2
timeout_in_minutes: 120

- wait

- label: "Running libc++ test suite in C++03"
- label: "Testing libc++ with just-built Clang (C++03)"
commands:
- "clang/utils/ci/run-buildbot generic-cxx03"
artifact_paths:
Expand All @@ -70,7 +47,7 @@ steps:
limit: 2
timeout_in_minutes: 120

- label: "Running libc++ test suite in C++26"
- label: "Testing libc++ with just-built Clang (C++26)"
commands:
- "clang/utils/ci/run-buildbot generic-cxx26"
artifact_paths:
Expand All @@ -87,7 +64,7 @@ steps:
limit: 2
timeout_in_minutes: 120

- label: "Running libc++ test suite with Clang Modules"
- label: "Testing libc++ with just-built Clang (w/ Clang Modules)"
commands:
- "clang/utils/ci/run-buildbot generic-modules"
artifact_paths:
Expand Down
25 changes: 1 addition & 24 deletions clang/utils/ci/run-buildbot
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,6 @@ cmake --version
ninja --version

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

ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
ccache -s
tar -cJvf install.tar.xz install/
buildkite-agent artifact upload --debug install.tar.xz

ninja -C ${BUILD_DIR} check-clang
;;
build-clang-windows)
cmake -S llvm -B ${BUILD_DIR} -G Ninja \
-D CMAKE_C_COMPILER_LAUNCHER=sccache \
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_INSTALL_PREFIX=install-windows \
-D LLVM_ENABLE_PROJECTS="clang;compiler-rt" \
-D LLVM_ENABLE_ASSERTIONS=ON \
-D LLVM_BUILD_EXAMPLES=ON \
-D COMPILER_RT_BUILD_LIBFUZZER=OFF \
-D COMPILER_RT_BUILD_ORC=OFF

ninja -C ${BUILD_DIR} install-clang install-clang-resource-headers
ninja -C ${BUILD_DIR} check-clang
;;
generic-cxx03)
buildkite-agent artifact download install.tar.xz .
Expand Down
Loading