From ed1f4876aa0a403bea52926bc09b1d4e1c05d469 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Oct 2023 14:08:30 +0200
Subject: [PATCH] CI: switch example & CI builds to ninja

---
 ci/build.sh             | 6 +++---
 ci/deps-debian11.sh     | 2 +-
 ci/deps-neon.sh         | 2 +-
 ci/deps-opensuse-qt6.sh | 2 +-
 ci/deps-opensuse.sh     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ci/build.sh b/ci/build.sh
index 3e8289b94..8cd6416a8 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -13,8 +13,8 @@ test -n "$GIT_HASH" && BUILD_MESSAGE=$( git log -1 --abbrev-commit --pretty=onel
 
 echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::"
 
-cmake -S "$SRCDIR" -B "$BUILDDIR" $CMAKE_ARGS || exit 1
-make -C "$BUILDDIR" -j2 VERBOSE=1 || exit 1
-make -C "$BUILDDIR" install VERBOSE=1 || exit 1
+cmake -S "$SRCDIR" -B "$BUILDDIR" -G Ninja $CMAKE_ARGS || exit 1
+ninja -C "$BUILDDIR" || exit 1
+ninja -C "$BUILDDIR" install || exit 1
 
 echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::"
diff --git a/ci/deps-debian11.sh b/ci/deps-debian11.sh
index bcd776e65..f2aa77d26 100755
--- a/ci/deps-debian11.sh
+++ b/ci/deps-debian11.sh
@@ -3,7 +3,7 @@
 # Install dependencies for the nightly-debian (11) build
 #
 apt-get update
-apt-get -y install git-core jq curl
+apt-get -y install git-core jq curl ninja
 apt-get -y install \
 	build-essential \
 	cmake \
diff --git a/ci/deps-neon.sh b/ci/deps-neon.sh
index 15fa4afe4..5ae1561c5 100755
--- a/ci/deps-neon.sh
+++ b/ci/deps-neon.sh
@@ -3,7 +3,7 @@
 # Install dependencies for the nightly-neon build
 #
 apt-get update
-apt-get -y install git-core jq
+apt-get -y install git-core jq ninja
 apt-get -y install \
 	build-essential \
 	cmake \
diff --git a/ci/deps-opensuse-qt6.sh b/ci/deps-opensuse-qt6.sh
index b524f5d6a..9687cea44 100755
--- a/ci/deps-opensuse-qt6.sh
+++ b/ci/deps-opensuse-qt6.sh
@@ -8,7 +8,7 @@ zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/h
 
 zypper --non-interactive refresh
 zypper --non-interactive up
-zypper --non-interactive in git-core jq curl
+zypper --non-interactive in git-core jq curl ninja
 # From deploycala.py
 zypper --non-interactive in bison flex git make cmake gcc-c++
 zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python-devel libboost_headers-devel libboost_python3-devel
diff --git a/ci/deps-opensuse.sh b/ci/deps-opensuse.sh
index df6eb5dc6..7f2bca5f1 100755
--- a/ci/deps-opensuse.sh
+++ b/ci/deps-opensuse.sh
@@ -3,7 +3,7 @@
 # Install dependencies for the nightly-opensuse build
 #
 zypper --non-interactive up
-zypper --non-interactive in git-core jq curl
+zypper --non-interactive in git-core jq curl ninja
 # From deploycala.py
 zypper --non-interactive in \
 	"bison" \