fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-20 15:00:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: sync the meson-build.sh script with libinput

Browse source 
Pulls in the three libinput commits up to 31ecda70087

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2023-01-10 08:56:13 +10:00
parent b2e12fe926
commit 54f4c054ea
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.gitlab-ci/meson-build.sh
View file

@ -1,4 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#
# SPDX-License-Identifier: MIT
set -x set -x
if [[ -f .meson_environment ]]; then if [[ -f .meson_environment ]]; then
@ -42,15 +44,16 @@ fi
# run and debug locally. # run and debug locally.
if [[ -z "$CI_JOB_ID" ]] || [[ -z "$CI_JOB_NAME" ]]; then if [[ -z "$CI_JOB_ID" ]] || [[ -z "$CI_JOB_NAME" ]]; then
echo "Missing \$CI_JOB_ID or \$CI_JOB_NAME". echo "Missing \$CI_JOB_ID or \$CI_JOB_NAME".
CI_PROJECT_NAME=$(basename "$PWD")
CI_JOB_ID=$(date +%s) CI_JOB_ID=$(date +%s)
CI_JOB_NAME='libevdev-job-local' CI_JOB_NAME="$CI_PROJECT_NAME-job-local"
echo "Simulating gitlab environment: " echo "Simulating gitlab environment: "
echo " CI_JOB_ID=$CI_JOB_ID" echo " CI_JOB_ID=$CI_JOB_ID"
echo " CI_JOB_NAME=$CI_JOB_NAME" echo " CI_JOB_NAME=$CI_JOB_NAME"
fi fi
if [[ -n "$FDO_CI_CONCURRENT" ]]; then 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" export MESON_TESTTHREADS="$FDO_CI_CONCURRENT"
fi fi
@ -59,6 +62,7 @@ echo "builddir: $MESON_BUILDDIR"
echo "meson args: $MESON_ARGS" echo "meson args: $MESON_ARGS"
echo "ninja args: $NINJA_ARGS" echo "ninja args: $NINJA_ARGS"
echo "meson test args: $MESON_TEST_ARGS" echo "meson test args: $MESON_TEST_ARGS"
echo "job count: ${jobcount-0}"
echo "*************************************************" echo "*************************************************"
set -e set -e
@ -70,7 +74,10 @@ fi
meson configure "$MESON_BUILDDIR" meson configure "$MESON_BUILDDIR"
if [[ -z "$MESON_SKIP_BUILD" ]]; then 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 fi
if [[ -n "$MESON_RUN_TEST" ]]; then if [[ -n "$MESON_RUN_TEST" ]]; then