diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-10 08:56:13 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-10 08:56:52 +1000 |
| commit | 54f4c054ea745c4f8f77c489230935aa291f5875 (patch) | |
| tree | 22e2eaf0d9ea2810b7d4d9a64a96fd5b77f6380f | |
| parent | b2e12fe926d232210fdf488455f97c8b3f2f700e (diff) | |
| download | libevdev-54f4c054ea745c4f8f77c489230935aa291f5875.tar.gz | |
gitlab CI: sync the meson-build.sh script with libinput
Pulls in the three libinput commits up to 31ecda70087
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rwxr-xr-x | .gitlab-ci/meson-build.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab-ci/meson-build.sh b/.gitlab-ci/meson-build.sh index d12dd0f..82f00e0 100755 --- a/.gitlab-ci/meson-build.sh +++ b/.gitlab-ci/meson-build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +# +# SPDX-License-Identifier: MIT set -x if [[ -f .meson_environment ]]; then @@ -42,15 +44,16 @@ fi # run and debug locally. if [[ -z "$CI_JOB_ID" ]] || [[ -z "$CI_JOB_NAME" ]]; then echo "Missing \$CI_JOB_ID or \$CI_JOB_NAME". + CI_PROJECT_NAME=$(basename "$PWD") CI_JOB_ID=$(date +%s) - CI_JOB_NAME='libevdev-job-local' + CI_JOB_NAME="$CI_PROJECT_NAME-job-local" echo "Simulating gitlab environment: " echo " CI_JOB_ID=$CI_JOB_ID" echo " CI_JOB_NAME=$CI_JOB_NAME" fi if [[ -n "$FDO_CI_CONCURRENT" ]]; then - NINJA_ARGS="-j$FDO_CI_CONCURRENT $NINJA_ARGS" + jobcount="-j$FDO_CI_CONCURRENT" export MESON_TESTTHREADS="$FDO_CI_CONCURRENT" fi @@ -59,6 +62,7 @@ echo "builddir: $MESON_BUILDDIR" echo "meson args: $MESON_ARGS" echo "ninja args: $NINJA_ARGS" echo "meson test args: $MESON_TEST_ARGS" +echo "job count: ${jobcount-0}" echo "*************************************************" set -e @@ -70,7 +74,10 @@ fi meson configure "$MESON_BUILDDIR" if [[ -z "$MESON_SKIP_BUILD" ]]; then - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS + if [[ -n "$NINJA_ARGS" ]]; then + ninja_args="--ninja-args $NINJA_ARGS" + fi + meson compile -v -C "$MESON_BUILDDIR" $jobcount $ninja_args fi if [[ -n "$MESON_RUN_TEST" ]]; then |