summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-05-19 09:49:39 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-05-25 11:17:45 +0000
commit873a88390608287a867d62e62dda2a6766b5872c (patch)
tree532e5bf7eb1c69c389ff257f0ec0db3a2b8fab4a
parentd09cc9db004a3a06048bf18cfb09f6eca2e80360 (diff)
downloadlibinput-873a88390608287a867d62e62dda2a6766b5872c.tar.gz
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>
-rwxr-xr-x.gitlab-ci/meson-build.sh3
1 files changed, 3 insertions, 0 deletions
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"