gitlab CI: skip the right tests in the tarball jobs

Use the new needs-uinput suite specifier for the meson build job, and
use --no-tests for ninja dist in the autotools build job.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c113ae787e52a7b1040378f3581d29435e54dc3c..a4e810eeeb65f7f6b094d99344ab5c66238191b3 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -810,13 +810,13 @@ meson-from-tarball:
     - pushd _build > /dev/null
     - ../autogen.sh --disable-silent-rules $CONFIGURE_FLAGS
     - make
-    - make distcheck
+    - make dist
     - popd > /dev/null
     - mkdir -p _tarball_dir
     - tar xf _build/libevdev-*.tar.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null
     - meson "$MESON_BUILDDIR" --prefix="$INSTALLDIR"
-    - ninja -C "$MESON_BUILDDIR" test
+    - meson test -C "$MESON_BUILDDIR" --no-suite="needs-uinput"
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
@@ -829,7 +829,7 @@ autotools-from-tarball:
   script:
     - export INSTALLDIR="$PWD/_inst"
     - meson "$MESON_BUILDDIR"
-    - ninja -C "$MESON_BUILDDIR" dist
+    - meson dist -C "$MESON_BUILDDIR" --no-tests
     - mkdir -p _tarball_dir
     - tar xf "$MESON_BUILDDIR"/meson-dist/libevdev-*.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index fc1be6e1620d2b968c41ea56b8b8331b0559a877..c8fd9aa23433c85e22bc73886211709aba03eb64 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -500,13 +500,13 @@ meson-from-tarball:
     - pushd _build > /dev/null
     - ../autogen.sh --disable-silent-rules $CONFIGURE_FLAGS
     - make
-    - make distcheck
+    - make dist
     - popd > /dev/null
     - mkdir -p _tarball_dir
     - tar xf _build/libevdev-*.tar.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null
     - meson "$MESON_BUILDDIR" --prefix="$INSTALLDIR"
-    - ninja -C "$MESON_BUILDDIR" test
+    - meson test -C "$MESON_BUILDDIR" --no-suite="needs-uinput"
     - ninja -C "$MESON_BUILDDIR" install
     - popd > /dev/null
     - ls -lR $INSTALLDIR
@@ -519,7 +519,7 @@ autotools-from-tarball:
   script:
     - export INSTALLDIR="$PWD/_inst"
     - meson "$MESON_BUILDDIR"
-    - ninja -C "$MESON_BUILDDIR" dist
+    - meson dist -C "$MESON_BUILDDIR" --no-tests
     - mkdir -p _tarball_dir
     - tar xf "$MESON_BUILDDIR"/meson-dist/libevdev-*.xz -C _tarball_dir
     - pushd _tarball_dir/libevdev-*/ > /dev/null