diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 08:59:27 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 10:30:47 +1000 |
| commit | 50ac79078ed4ba364bc52014eb98e5c72219c2ab (patch) | |
| tree | 8c461e7b9754955324a467573c4bfb36cc3fd78b | |
| parent | 37f71a849395c51b9e9df2d171c7e9f3e76db565 (diff) | |
| download | libevdev-50ac79078ed4ba364bc52014eb98e5c72219c2ab.tar.gz | |
gitlab CI: pass the --no-suite to meson builds
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>
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14851ce..a71e474 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,6 @@ stages: variables: # The upstrem repository we will check for images FDO_UPSTREAM_REPO: libevdev/libevdev - LIBEVDEV_SKIP_ROOT_TESTS: 1 GIT_DEPTH: 1 MESON_BUILDDIR: 'build dir' @@ -59,12 +58,16 @@ variables: - make check - if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi - popd > /dev/null + variables: + LIBEVDEV_SKIP_ROOT_TESTS: 1 .meson_build: extends: - .default_artifacts script: - .gitlab-ci/meson-build.sh --run-test + variables: + MESON_TEST_ARGS: '--no-suite=needs-uinput' .fedora:34: extends: .fdo.distribution-image@fedora diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index ed08d5d..0eb1cea 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -30,7 +30,6 @@ stages: variables: # The upstrem repository we will check for images FDO_UPSTREAM_REPO: libevdev/libevdev - LIBEVDEV_SKIP_ROOT_TESTS: 1 GIT_DEPTH: 1 MESON_BUILDDIR: 'build dir' @@ -55,12 +54,16 @@ variables: - make check - if ! [[ -z "$MAKE_ARGS" ]]; then make $MAKE_ARGS; fi - popd > /dev/null + variables: + LIBEVDEV_SKIP_ROOT_TESTS: 1 .meson_build: extends: - .default_artifacts script: - .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 job can then just extends: .name:version and the images will sort |