diff options
| -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 |