From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 10 May 2021 17:03:00 +0000 (+0100)
Subject: gitlab: remove ability to skip 'ninja dist'
X-Git-Tag: v7.4.0-rc1~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cbcea448a11944c38c99a52f86aca93b1f352d7;p=thirdparty%2Flibvirt.git

gitlab: remove ability to skip 'ninja dist'

The "DIST=skip" flag as used in CentOS 7 jobs to workaround a problem
with older git versions. This is no longer required since

  commit d35003aee7d057e66d935cfd919ea86d5d450c4c
  Author: Andrea Bolognani <abologna@redhat.com>
  Date:   Tue May 4 10:45:29 2021 +0200

    ci: Drop CentOS 7

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf0ce268b8..a3b0e9ebba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -61,13 +61,7 @@ stages:
     - *script_variables
   script:
     - meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
-    - if test "$DIST" != "skip";
-      then
-        ninja -C build dist;
-      else
-        ninja -C build;
-        ninja -C build test;
-      fi
+    - ninja -C build dist;
     - if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
       then
         rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz;