Author: Louis Dionne Date: 2023-08-23T22:21:53-04:00 New Revision: bb6073c7e32b5062a6969242c6bd4fe859e2e5e0
URL: https://github.com/llvm/llvm-project/commit/bb6073c7e32b5062a6969242c6bd4fe859e2e5e0 DIFF: https://github.com/llvm/llvm-project/commit/bb6073c7e32b5062a6969242c6bd4fe859e2e5e0.diff LOG: [clang] Fix the pre-commit CI pipeline after changes to libc++'s own CI pipeline We made some changes to the libc++ CI pipeline that take for granted that we're running on libc++'s own Docker images. This was necessary for a temporary period until widely-used tools update to a version that can handle C++20 modules. However, this had the unintended consequence of breaking the Clang CI pipeline, which used the libc++ CI scripts as an implementation detail. Instead, decouple the Clang CI pipeline from the libc++ build scripts. Differential Revision: https://reviews.llvm.org/D158690 Added: Modified: clang/utils/ci/run-buildbot Removed: ################################################################################ diff --git a/clang/utils/ci/run-buildbot b/clang/utils/ci/run-buildbot index ef3909a5babc9d..91246f1d429736 100755 --- a/clang/utils/ci/run-buildbot +++ b/clang/utils/ci/run-buildbot @@ -60,6 +60,10 @@ MONOREPO_ROOT="${MONOREPO_ROOT:="$(git rev-parse --show-toplevel)"}" BUILD_DIR="${BUILD_DIR:=${MONOREPO_ROOT}/build/${BUILDER}}" INSTALL_DIR="${BUILD_DIR}/install" +function clean() { + rm -rf "${BUILD_DIR}" +} + # Print the version of a few tools to aid diagnostics in some cases cmake --version ninja --version @@ -95,7 +99,17 @@ generic-cxx03) export CC=$(pwd)/install/bin/clang export CXX=$(pwd)/install/bin/clang++ chmod +x install/bin/clang install/bin/clang++ - libcxx/utils/ci/run-buildbot generic-cxx03 + + clean + cmake -S "${MONOREPO_ROOT}/runtimes" -B "${BUILD_DIR}" -GNinja \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ + -DLIBCXX_CXX_ABI=libcxxabi \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ + -DLIBCXX_TEST_PARAMS="std=c++03" \ + -DLIBCXXABI_TEST_PARAMS="std=c++03" + + ninja -vC "${BUILD_DIR}" check-runtimes ;; generic-cxx26) buildkite-agent artifact download install.tar.xz . @@ -103,7 +117,17 @@ generic-cxx26) export CC=$(pwd)/install/bin/clang export CXX=$(pwd)/install/bin/clang++ chmod +x install/bin/clang install/bin/clang++ - libcxx/utils/ci/run-buildbot generic-cxx26 + + clean + cmake -S "${MONOREPO_ROOT}/runtimes" -B "${BUILD_DIR}" -GNinja \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ + -DLIBCXX_CXX_ABI=libcxxabi \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ + -DLIBCXX_TEST_PARAMS="std=c++26" \ + -DLIBCXXABI_TEST_PARAMS="std=c++26" + + ninja -vC "${BUILD_DIR}" check-runtimes ;; generic-modules) buildkite-agent artifact download install.tar.xz . @@ -111,7 +135,17 @@ generic-modules) export CC=$(pwd)/install/bin/clang export CXX=$(pwd)/install/bin/clang++ chmod +x install/bin/clang install/bin/clang++ - libcxx/utils/ci/run-buildbot generic-modules + + clean + cmake -S "${MONOREPO_ROOT}/runtimes" -B "${BUILD_DIR}" -GNinja \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ + -DLIBCXX_CXX_ABI=libcxxabi \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \ + -DLIBCXX_TEST_PARAMS="enable_modules=clang" \ + -DLIBCXXABI_TEST_PARAMS="enable_modules=clang" + + ninja -vC "${BUILD_DIR}" check-runtimes ;; ################################################################# # Insert vendor-specific internal configurations below. _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits