Skip to content

Commit bcd8821

Browse files
committed
ci: use ninja to build under linux/macos
This is done to make the output when the build fails a bit easier to read, specifically we'd like to see the compiler command used. This theoretically will improve the build performance a bit by doing the compilation in parallel, however the cost for installing ninja likely more than offsets this. Signed-off-by: GitHub <noreply@github.com>
1 parent d371931 commit bcd8821

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ jobs:
3333
- uses: actions/checkout@v2
3434
with:
3535
submodules: true
36+
- name: Install Prerequisites
37+
shell: bash
38+
run: sudo apt install -y ninja-build
3639

3740
- name: Configure Build & Test
3841
shell: bash
@@ -46,6 +49,9 @@ jobs:
4649
- uses: actions/checkout@v2
4750
with:
4851
submodules: true
52+
- name: Install Prerequisites
53+
shell: bash
54+
run: brew install ninja
4955

5056
- name: Configure Build & Test
5157
shell: bash

travis.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
build_cmake() {
44
mkdir $PWD/_build && cd $PWD/_build
5-
cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Wno-implicit-fallthrough -Werror"
5+
cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Wno-implicit-fallthrough -Werror"
66
cmake --build . --target install
77
ctest -V .
88
}
99

1010
build_macos() {
1111
mkdir $PWD/_build && cd $PWD/_build
12-
cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror" \
12+
cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror" \
1313
-DOPENSSL_ROOT_DIR="/usr/local/opt/openssl@1.1"
1414
cmake --build . --target install
1515
ctest -V .
@@ -24,7 +24,7 @@ build_format() {
2424

2525
build_coverage() {
2626
mkdir $PWD/_build && cd $PWD/_build
27-
cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Coverage -DCMAKE_INSTALL_PREFIX=$PWD/../_install \
27+
cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Coverage -DCMAKE_INSTALL_PREFIX=$PWD/../_install \
2828
-DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror -fprofile-arcs -ftest-coverage"
2929
cmake --build . --target install
3030
ctest -V .
@@ -35,15 +35,15 @@ build_coverage() {
3535

3636
build_asan() {
3737
mkdir $PWD/_build && cd $PWD/_build
38-
cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \
38+
cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \
3939
-DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror -fsanitize=address,undefined -O1"
4040
cmake --build . --target install
4141
ctest -V .
4242
}
4343

4444
build_tsan() {
4545
mkdir $PWD/_build && cd $PWD/_build
46-
cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \
46+
cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \
4747
-DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror -fsanitize=thread,undefined -O1"
4848
cmake --build . --target install
4949
ctest -V .
@@ -52,11 +52,11 @@ build_tsan() {
5252
build_scan-build() {
5353
sudo apt-get install -y clang-tools
5454
mkdir $PWD/_build && cd $PWD/_build
55-
scan-build cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug \
55+
scan-build cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug \
5656
-DCMAKE_C_COMPILER=clang \
5757
-DCMAKE_INSTALL_PREFIX=$PWD/../_install \
5858
-DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror"
59-
scan-build make install
59+
scan-build ninja install
6060
}
6161

6262
if [ "$#" -ne 1 ]; then

0 commit comments

Comments
 (0)