From aaa34ea62249dc8a5db7aea12b3f0fe957bc28b3 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sun, 21 Jun 2020 16:39:30 +0500 Subject: [PATCH] CI: travis-ci: switch BoringSSL builds to ninja using ninja instead of make speed up build by 40 sec --- .travis.yml | 2 +- scripts/build-ssl.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6199bc881..39b52ce2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ env: addons: apt: update: true - packages: [ liblua5.3-dev, libsystemd-dev, libpcre2-dev, clang-9, socat ] + packages: [ liblua5.3-dev, libsystemd-dev, libpcre2-dev, clang-9, socat, ninja-build ] homebrew: update: true packages: [ socat ] diff --git a/scripts/build-ssl.sh b/scripts/build-ssl.sh index 0940f3c22..34eee9bb9 100755 --- a/scripts/build-ssl.sh +++ b/scripts/build-ssl.sh @@ -100,8 +100,8 @@ if [ ! -z ${BORINGSSL+x} ]; then if [ -d build ]; then rm -rf build; fi mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 .. - make + cmake -GNinja -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 .. + ninja rm -rf ${SSL_LIB} || exit 0 rm -rf ${SSL_INC} || exit 0