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

gitlab CI: pass the --no-suite to meson builds

Browse source 
Only use the LIBEVDEV_SKIP_ROOT_TESTS env var in autotools where we need
it, in meson we can use meson to control which tests we (don't) want to
run.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2023-01-05 08:59:27 +10:00
parent 37f71a8493
commit 50ac79078e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -34,7 +34,6 @@ stages:
variables: variables:
# The upstrem repository we will check for images # The upstrem repository we will check for images
FDO_UPSTREAM_REPO: libevdev/libevdev FDO_UPSTREAM_REPO: libevdev/libevdev
LIBEVDEV_SKIP_ROOT_TESTS: 1
GIT_DEPTH: 1 GIT_DEPTH: 1
MESON_BUILDDIR: 'build dir' MESON_BUILDDIR: 'build dir'
@ -59,12 +58,16 @@ variables:
- make check - make check
- if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi - if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi
- popd > /dev/null - popd > /dev/null
variables:
LIBEVDEV_SKIP_ROOT_TESTS: 1
.meson_build: .meson_build:
extends: extends:
- .default_artifacts - .default_artifacts
script: script:
- .gitlab-ci/meson-build.sh --run-test - .gitlab-ci/meson-build.sh --run-test
variables:
MESON_TEST_ARGS: '--no-suite=needs-uinput'
.fedora:34: .fedora:34:
extends: .fdo.distribution-image@fedora extends: .fdo.distribution-image@fedora

5
.gitlab-ci/ci.template
View file

@ -30,7 +30,6 @@ stages:
variables: variables:
# The upstrem repository we will check for images # The upstrem repository we will check for images
FDO_UPSTREAM_REPO: libevdev/libevdev FDO_UPSTREAM_REPO: libevdev/libevdev
LIBEVDEV_SKIP_ROOT_TESTS: 1
GIT_DEPTH: 1 GIT_DEPTH: 1
MESON_BUILDDIR: 'build dir' MESON_BUILDDIR: 'build dir'
@ -55,12 +54,16 @@ variables:
- make check - make check
- if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi - if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi
- popd > /dev/null - popd > /dev/null
variables:
LIBEVDEV_SKIP_ROOT_TESTS: 1
.meson_build: .meson_build:
extends: extends:
- .default_artifacts - .default_artifacts
script: script:
- .gitlab-ci/meson-build.sh --run-test - .gitlab-ci/meson-build.sh --run-test
variables:
MESON_TEST_ARGS: '--no-suite=needs-uinput'
{# Generate templates for every distribution/version combination we want, any {# Generate templates for every distribution/version combination we want, any
job can then just extends: .name:version and the images will sort job can then just extends: .name:version and the images will sort