diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 10:11:37 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2023-01-05 10:26:39 +1000 |
| commit | 6be54f75c88a8257f1db380f73e36bc9c4fa5ac1 (patch) | |
| tree | af4ffd993a356df35ab6c335ea6c90b234c192dd | |
| parent | 427af9d2488a8289dd4ef81ec562c7636bdb18a5 (diff) | |
| download | libevdev-6be54f75c88a8257f1db380f73e36bc9c4fa5ac1.tar.gz | |
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>
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .gitlab-ci/ci.template | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c113ae7..a4e810e 100644 --- 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 fc1be6e..c8fd9aa 100644 --- 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 |