Skip to content

Commit 4e274e6

Browse files
bors[bot]vext01
andauthored
65: Use ninja for CI. r=ltratt a=vext01 Co-authored-by: Edd Barrett <[email protected]>
2 parents 86e6aa8 + 8163f01 commit 4e274e6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.buildbot.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ cmake -DCMAKE_INSTALL_PREFIX=${INST_DIR} \
1414
-DLLVM_ENABLE_ASSERTIONS=On \
1515
-DLLVM_ENABLE_PROJECTS="lld;clang" \
1616
-DCLANG_DEFAULT_PIE_ON_LINUX=OFF \
17+
-GNinja \
1718
../llvm
18-
make -j `nproc` install
19+
cmake --build .
20+
cmake --install .
1921

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

3535
# FIXME The commented code below should run the `test-suite` tests, as
3636
# described at https://llvm.org/docs/TestSuiteGuide.html.

.buildbot_dockerfile_debian

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ FROM debian:bullseye
22
ARG CI_UID
33
RUN useradd -m -u ${CI_UID} ci
44
RUN apt-get update && \
5-
apt-get -y install build-essential curl cmake python3-distutils git
5+
apt-get -y install build-essential curl cmake python3-distutils git \
6+
ninja-build
67
WORKDIR /ci
78
RUN chown ${CI_UID}:${CI_UID} .
89
COPY --chown=${CI_UID}:${CI_UID} . .

0 commit comments

Comments
 (0)