From bcd882101b5dc424be25dbb2693c8688ec016b33 Mon Sep 17 00:00:00 2001 From: Alan Antonuk Date: Tue, 20 Apr 2021 00:14:55 +0000 Subject: 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 --- travis.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'travis.sh') diff --git a/travis.sh b/travis.sh index 6d77749..2343216 100755 --- a/travis.sh +++ b/travis.sh @@ -2,14 +2,14 @@ build_cmake() { mkdir $PWD/_build && cd $PWD/_build - cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Wno-implicit-fallthrough -Werror" + cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Wno-implicit-fallthrough -Werror" cmake --build . --target install ctest -V . } build_macos() { mkdir $PWD/_build && cd $PWD/_build - cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror" \ + cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=$PWD/../_install -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror" \ -DOPENSSL_ROOT_DIR="/usr/local/opt/openssl@1.1" cmake --build . --target install ctest -V . @@ -24,7 +24,7 @@ build_format() { build_coverage() { mkdir $PWD/_build && cd $PWD/_build - cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Coverage -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ + cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Coverage -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror -fprofile-arcs -ftest-coverage" cmake --build . --target install ctest -V . @@ -35,7 +35,7 @@ build_coverage() { build_asan() { mkdir $PWD/_build && cd $PWD/_build - cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ + cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror -fsanitize=address,undefined -O1" cmake --build . --target install ctest -V . @@ -43,7 +43,7 @@ build_asan() { build_tsan() { mkdir $PWD/_build && cd $PWD/_build - cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ + cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror -fsanitize=thread,undefined -O1" cmake --build . --target install ctest -V . @@ -52,11 +52,11 @@ build_tsan() { build_scan-build() { sudo apt-get install -y clang-tools mkdir $PWD/_build && cd $PWD/_build - scan-build cmake .. -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug \ + scan-build cmake .. -GNinja -DBUILD_EXAMPLES=ON -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_C_COMPILER=clang \ -DCMAKE_INSTALL_PREFIX=$PWD/../_install \ -DCMAKE_C_FLAGS="-Wall -Wextra -Wstrict-prototypes -Wno-unused-function -Werror" - scan-build make install + scan-build ninja install } if [ "$#" -ne 1 ]; then -- cgit v1.2.1