From 792739ee42add6bd20bc245323d38b65b123c00b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 20 Nov 2021 19:02:53 +0100 Subject: [PATCH] core: add build with CMake and Ninja in CI --- .github/workflows/ci.yml | 3 ++- ChangeLog.adoc | 1 + tools/build-test.sh | 15 +++++++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 131c7e689..8bd3853ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,7 @@ jobs: - ubuntu-20.04 config: - { name: "cmake_gcc", cc: "gcc", cxx: "g++", tool: "cmake", args: "" } + - { name: "cmake_gcc_ninja", cc: "gcc", cxx: "g++", tool: "cmake", args: "-G Ninja" } - { name: "cmake_gcc_no_nls", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_NLS=OFF" } - { name: "cmake_gcc_py2", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_PYTHON2=ON" } - { name: "cmake_gcc_coverage", cc: "gcc", cxx: "g++", tool: "cmake", args: "-DENABLE_CODE_COVERAGE=ON" } @@ -33,7 +34,7 @@ jobs: run: | sudo apt-add-repository --yes ppa:ondrej/php sudo apt-get update -qq - sudo apt-get --yes --no-install-recommends install devscripts equivs python3-pip libenchant-dev autopoint cmake lcov pkg-config libncursesw5-dev gem2deb libperl-dev python2-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-0-dev libsodium-dev pylint python3-bandit asciidoctor + sudo apt-get --yes --no-install-recommends install devscripts equivs python3-pip libenchant-dev autopoint cmake ninja-build lcov pkg-config libncursesw5-dev gem2deb libperl-dev python2-dev python3-dev libaspell-dev liblua5.3-dev tcl8.6-dev guile-2.0-dev libv8-dev libcurl4-gnutls-dev libgcrypt20-dev libgnutls28-dev zlib1g-dev curl libcpputest-dev php8.0-dev libphp8.0-embed libargon2-0-dev libsodium-dev pylint python3-bandit asciidoctor sudo -H pip3 install --ignore-installed msgcheck - name: Test patches diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 7b2d564df..768a14c08 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -42,6 +42,7 @@ Bug fixes:: Tests:: + * core: add build with CMake and Ninja in CI * core: add build on macOS 11 in CI Build:: diff --git a/tools/build-test.sh b/tools/build-test.sh index 0653e5414..7937044a7 100755 --- a/tools/build-test.sh +++ b/tools/build-test.sh @@ -68,10 +68,17 @@ run "cd $BUILDDIR" if [ "$BUILDTOOL" = "cmake" ]; then # build with CMake run "cmake .. -DENABLE_MAN=ON -DENABLE_DOC=ON -DENABLE_TESTS=ON ${BUILDARGS}" - run "make VERBOSE=1 -j$(nproc)" - run "make VERBOSE=1 changelog" - run "make VERBOSE=1 rn" - run "sudo make install" + if [ -f "build.ninja" ]; then + run "ninja -v" + run "ninja -v changelog" + run "ninja -v rn" + run "sudo ninja install" + else + run "make VERBOSE=1 -j$(nproc)" + run "make VERBOSE=1 changelog" + run "make VERBOSE=1 rn" + run "sudo make install" + fi run "ctest -V" fi