mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
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 d35003aee7
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>
This commit is contained in:
parent
6f9226638a
commit
9cbcea448a
@ -61,13 +61,7 @@ stages:
|
|||||||
- *script_variables
|
- *script_variables
|
||||||
script:
|
script:
|
||||||
- meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
|
- meson build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
|
||||||
- if test "$DIST" != "skip";
|
- ninja -C build dist;
|
||||||
then
|
|
||||||
ninja -C build dist;
|
|
||||||
else
|
|
||||||
ninja -C build;
|
|
||||||
ninja -C build test;
|
|
||||||
fi
|
|
||||||
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
|
- if test -x /usr/bin/rpmbuild && test "$RPM" != "skip";
|
||||||
then
|
then
|
||||||
rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz;
|
rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz;
|
||||||
|
Loading…
Reference in New Issue
Block a user