From nobody Sun Feb 8 17:37:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620673774; cv=none; d=zohomail.com; s=zohoarc; b=R99EyyX5jkp6bHJbe/xvrt0O4y54CeTtRh5hfcs2ipSz58NQ/+XHmpCgiZHGO1+3hPAO4orn5G5Oy3k2r4nq5Q69oYofsPg69Gjqrfik+0Fw0X0w76pQvWFhLFS/fb//tEiV5HL0jr6DxCphZK1gMkEH08d7Ub4+DFI2LDn1TkQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620673774; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ft3NsvmwDKBtZDlgsGWBFyVclzVU9qcZ2N8ulpDZkxE=; b=aY6IgifcF0PGDonFdx/vuYx599B/DSbqHI57Z6WBNdMlu+ZnlXGaa/9ReFioDTGybgcl21S/94/qOz69kTlFwrXprR9iMqVOML//h5K9iqckxGhVN8nzC1Gv7ZxpOOIVovxKlUWOXyyE1R5CGBNTW8yV+nNiUHczy2AsS0tWo14= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1620673774509158.86080526190472; Mon, 10 May 2021 12:09:34 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-b1GElLTiP9mYmDA9cn3O0Q-1; Mon, 10 May 2021 15:09:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B29D8E70F4; Mon, 10 May 2021 19:08:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36DF319C45; Mon, 10 May 2021 19:08:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EAFA85535F; Mon, 10 May 2021 19:08:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14AJ8B2r005940 for ; Mon, 10 May 2021 15:08:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 08FDD94C4C; Mon, 10 May 2021 19:08:11 +0000 (UTC) Received: from foo.redhat.com (ovpn-115-206.ams2.redhat.com [10.36.115.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EB958CB1B; Mon, 10 May 2021 19:08:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620673773; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ft3NsvmwDKBtZDlgsGWBFyVclzVU9qcZ2N8ulpDZkxE=; b=QVzggTKTjQemSwKJBgAPdas961hAae9wbIU6hliI93igFZTX9QQhRMz7RaIpnh5toADmyu kIK/G5VzRWQTvGYTJX6NhQuB5D3otQV3zcN+yZfjFutkWFSSS8tlOWqWKHq1gEuVUc9usB vhmuT2EGhsWlqNw7Pr2z1m0nEfKFvFQ= X-MC-Unique: b1GElLTiP9mYmDA9cn3O0Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] gitlab: run "meson" directly instead of "ninja" indirection Date: Mon, 10 May 2021 20:08:00 +0100 Message-Id: <20210510190801.945694-4-berrange@redhat.com> In-Reply-To: <20210510190801.945694-1-berrange@redhat.com> References: <20210510190801.945694-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The "dist" and "test" targets in ninja end up calling back into the equivalent meson commands. The meson commands support various arguments that are not accessible when invoked via ninja, so it is preferrable to use meson directly. Signed-off-by: Daniel P. Berrang=C3=A9 --- .gitlab-ci.yml | 20 ++++++++++---------- ci/cirrus/build.yml | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3b0e9ebba..9dfbd0ca54 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,8 +60,8 @@ stages: before_script: - *script_variables script: - - meson build --werror || (cat build/meson-logs/meson-log.txt && exit = 1) - - ninja -C build dist; + - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) + - meson dist -C build - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz; @@ -122,9 +122,9 @@ stages: before_script: - *script_variables script: - - meson build --werror $MESON_OPTS || (cat build/meson-logs/meson-log.= txt && exit 1) - - ninja -C build - - if test "$CROSS" =3D "i686" ; then ninja -C build test ; fi + - meson setup build --werror $MESON_OPTS || (cat build/meson-logs/meso= n-log.txt && exit 1) + - meson compile -C build + - if test "$CROSS" =3D "i686" ; then meson test -C build --print-error= logs ; fi =20 =20 # Native container build jobs @@ -527,7 +527,7 @@ website: before_script: - *script_variables script: - - meson build --werror --prefix=3D$(pwd)/vroot || (cat build/meson-log= s/meson-log.txt && exit 1) + - meson setup build --werror --prefix=3D$(pwd)/vroot || (cat build/mes= on-logs/meson-log.txt && exit 1) - ninja -C build install-web - mv vroot/share/doc/libvirt/html/ website artifacts: @@ -547,7 +547,7 @@ codestyle: before_script: - *script_variables script: - - meson build --werror || (cat build/meson-logs/meson-log.txt && exit = 1) + - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - ninja -C build libvirt-pot-dep - meson test -C build --suite syntax-check --no-rebuild --print-errorl= ogs =20 @@ -565,7 +565,7 @@ potfile: before_script: - *script_variables script: - - meson build --werror || (cat build/meson-logs/meson-log.txt && exit = 1) + - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - ninja -C build libvirt-pot-dep - ninja -C build libvirt-pot - cp po/libvirt.pot libvirt.pot @@ -603,8 +603,8 @@ coverity: script: - curl https://scan.coverity.com/download/linux64 --form project=3D$CO= VERITY_SCAN_PROJECT_NAME --form token=3D$COVERITY_SCAN_TOKEN -o /tmp/cov-an= alysis-linux64.tgz - tar xfz /tmp/cov-analysis-linux64.tgz - - meson build --werror || (cat build/meson-logs/meson-log.txt && exit = 1) - - cov-analysis-linux64-*/bin/cov-build --dir cov-int ninja -C build + - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) + - cov-analysis-linux64-*/bin/cov-build --dir cov-int meson compile -C = build - tar cfz cov-int.tar.gz cov-int - curl https://scan.coverity.com/builds?project=3D$COVERITY_SCAN_PROJE= CT_NAME --form token=3D$COVERITY_SCAN_TOKEN --form email=3D$GITLAB_USER_EMA= IL --form file=3D@cov-int.tar.gz --form version=3D"$(git describe --tags)" = --form description=3D"$(git describe --tags) / $CI_COMMIT_TITLE / $CI_COMMI= T_REF_NAME:$CI_PIPELINE_ID" rules: diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index f7ef5c2d13..c9420a8d91 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -22,5 +22,5 @@ build_task: - git fetch origin "$CI_COMMIT_REF_NAME" - git reset --hard "$CI_COMMIT_SHA" build_script: - - meson build - - ninja -C build dist + - meson setup build + - meson dist -C build --=20 2.31.1