Skip to content

Commit

Permalink
Merge rust-lang#65
Browse files Browse the repository at this point in the history
65: Use ninja for CI. r=ltratt a=vext01



Co-authored-by: Edd Barrett <vext01@gmail.com>
  • Loading branch information
bors[bot] and vext01 authored Apr 27, 2023
2 parents 86e6aa8 + 8163f01 commit 4e274e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .buildbot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ cmake -DCMAKE_INSTALL_PREFIX=${INST_DIR} \
-DLLVM_ENABLE_ASSERTIONS=On \
-DLLVM_ENABLE_PROJECTS="lld;clang" \
-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
-GNinja \
../llvm
make -j `nproc` install
cmake --build .
cmake --install .

# clang-format any new files that we've introduced ourselves.
cd ..
Expand All @@ -28,9 +30,7 @@ git diff --exit-code
# https://llvm.org/docs/TestingGuide.html
#
# This runs unit and integration tests.
cd build
make -j `nproc` check-all
cd ..
cmake --build build --target check-all

# FIXME The commented code below should run the `test-suite` tests, as
# described at https://llvm.org/docs/TestSuiteGuide.html.
Expand Down
3 changes: 2 additions & 1 deletion .buildbot_dockerfile_debian
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ FROM debian:bullseye
ARG CI_UID
RUN useradd -m -u ${CI_UID} ci
RUN apt-get update && \
apt-get -y install build-essential curl cmake python3-distutils git
apt-get -y install build-essential curl cmake python3-distutils git \
ninja-build
WORKDIR /ci
RUN chown ${CI_UID}:${CI_UID} .
COPY --chown=${CI_UID}:${CI_UID} . .
Expand Down

0 comments on commit 4e274e6

Please sign in to comment.