From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue, 18 May 2021 23:49:39 +0000 (+1000)
Subject: gitlab CI: use FDO_CI_CONCURRENT in our meson build script
X-Git-Tag: 1.17.901~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=873a88390608287a867d62e62dda2a6766b5872c;p=platform%2Fupstream%2Flibinput.git

gitlab CI: use FDO_CI_CONCURRENT in our meson build script

Always prefix the ninja args with the FDO_CI_CONCURRENT values (i.e. how many
jobs the runner tells us).

Note that this variable is currently not passed through to the qemu jobs, so
inside the VM we'll still use the ninja default values.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh
index a8615735..59a371a1 100755
--- a/.gitlab-ci/meson-build.sh
+++ b/.gitlab-ci/meson-build.sh
@@ -20,6 +20,9 @@ if [[ -z "$CI_JOB_ID" ]] || [[ -z "$CI_JOB_NAME" ]]; then
 	echo " CI_JOB_NAME=$CI_JOB_NAME"
 fi
 
+if [[ -n "$FDO_CI_CONCURRENT" ]]; then
+	NINJA_ARGS="-j${FDO_CI_CONCURRENT} $NINJA_ARGS"
+fi
 
 echo "*************************************************"
 echo "builddir: $MESON_BUILDDIR"