gitlab CI: drop the ninja dist for every job

Unlike autotools distcheck which ensures we didn't forget to add
anything to the makefiles, ninja dist just zips up the git repo.

It does run the tests though but without suite selection which is a
problem for us here.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4e810eeeb65f7f6b094d99344ab5c66238191b3..14851ce8034d83e1642d89312157a02ae7b5eef0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,7 @@ variables:
   extends:
     - .default_artifacts
   script:
-    - .gitlab-ci/meson-build.sh
+    - .gitlab-ci/meson-build.sh --run-test
 
 .fedora:34:
   extends: .fdo.distribution-image@fedora
@@ -496,8 +496,6 @@ alpine:latest@container-clean:
     - .meson_build
   stage: build
   dependencies: []
-  variables:
-    NINJA_ARGS: "dist"
 
 
 fedora:34@autotools-build:

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index c8fd9aa23433c85e22bc73886211709aba03eb64..ed08d5d24f71c66868f2d58cf027f984a88a0f74 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -60,7 +60,7 @@ variables:
   extends:
     - .default_artifacts
   script:
-    - .gitlab-ci/meson-build.sh
+    - .gitlab-ci/meson-build.sh --run-test
 
 {# Generate templates for every distribution/version combination we want, any
   job can then just extends: .name:version and the images will sort
@@ -265,8 +265,6 @@ check-merge-request:
     - .meson_build
   stage: build
   dependencies: []
-  variables:
-    NINJA_ARGS: "dist"
 
 {% for distro in distributions %}
 {% for version in distro.versions %}