gitlab CI: use FDO_CI_CONCURRENT in our meson build script
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 18 May 2021 23:49:39 +0000 (09:49 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Tue, 25 May 2021 11:17:45 +0000 (11:17 +0000)
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>
.gitlab-ci/meson-build.sh

index a8615735b36acc727034e62d13f8266c70997264..59a371a112e4b07f08d447ca11f7abb1f8130aaa 100755 (executable)
@@ -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"