summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2023-01-05 09:16:15 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2023-01-05 09:18:17 +1000
commitac3d44ee7a1363c913a7b24768cdda6e0d55deb5 (patch)
tree86cf3d89817ce7e074a520b41cbf36419b492168
parent46ed9e53e4faf4c987640f4fe0fa048bad1fc073 (diff)
downloadlibevdev-ac3d44ee7a1363c913a7b24768cdda6e0d55deb5.tar.gz
gitlab CI: drop MESON_SKIP_TEST variables
In the no-check:meson job, the ninja arg was "dist" so the test would be run as part of that anyway (and skipped, since we didn't have check). In the no-doxygen-check:meson job, the ninja arg was zero so the test would be skipped but since we don't have check we might as well just run it as empty test suite. And the same applies to the scan-build job, running the test shouldn't hurt here. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--.gitlab-ci/ci.template3
2 files changed, 0 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c27771a..892e0c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -684,7 +684,6 @@ no-check:meson:
- dnf remove -y check check-devel
variables:
MESON_ARGS: -Dtests=disabled
- SKIP_MESON_TEST: 1
# doxygen is required for dist
no-doxygen:meson:
@@ -703,7 +702,6 @@ no-doxygen-check-valgrind:meson:
variables:
MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled
NINJA_ARGS: ''
- SKIP_MESON_TEST: 1
enable-gcov:meson:
extends: .fedora-custom-build@meson-template
@@ -714,7 +712,6 @@ scan-build:meson:
extends: .fedora-custom-build@meson-template
variables:
NINJA_ARGS: 'scan-build'
- SKIP_MESON_TEST: 1
static-build:meson:
extends: .fedora-custom-build@meson-template
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 4d7bf00..9385957 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -369,7 +369,6 @@ no-check:meson:
- dnf remove -y check check-devel
variables:
MESON_ARGS: -Dtests=disabled
- SKIP_MESON_TEST: 1
# doxygen is required for dist
no-doxygen:meson:
@@ -388,7 +387,6 @@ no-doxygen-check-valgrind:meson:
variables:
MESON_ARGS: -Dtests=disabled -Ddocumentation=disabled
NINJA_ARGS: ''
- SKIP_MESON_TEST: 1
enable-gcov:meson:
extends: .fedora-custom-build@meson-template
@@ -399,7 +397,6 @@ scan-build:meson:
extends: .fedora-custom-build@meson-template
variables:
NINJA_ARGS: 'scan-build'
- SKIP_MESON_TEST: 1
static-build:meson:
extends: .fedora-custom-build@meson-template