From nobody Wed May 15 04:47:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1620673756; cv=none; d=zohomail.com; s=zohoarc; b=g/AxbU0JRWsPLgxzMFRJP50h03u2vPH3aSulTrh6okXmN1LzbEdrjxDrvlbrh+pGh1j77bmaDbzprdoXh/2y13U8gWIIjaJgbi8kk5yATzJbQhAoUh13hgUfB1ebmlzS0rVySGrSCahOjAeWwo/8gJKnLXUygoSZLoEnTdWZiKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620673756; 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=OA1pOjkdehVyXBH2+6ikQimAJTy1v6yw22mJ91vIqVM=; b=oC/Knci77/NjhcY1JpzEGsdLxU0JE7IzFPDWYp3o0gVgs6Vj1eIP/hObjWzzgXnbeiBw4zChA7yXsg6SvldsIwmnZuPQbHdSVEEjph+cintpTRuixgS3hGXT3n2WJdukOrKKCQpkt7RxO/al14bSnSScYZ8U2kk1Fa93iHBuim8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620673756601606.5131866665016; Mon, 10 May 2021 12:09:16 -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-582-NESMbnvzPUWnfLn7YpKMbQ-1; Mon, 10 May 2021 15:09:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6AA736D269; Mon, 10 May 2021 19:08:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 08B8F70E6D; Mon, 10 May 2021 19:08:11 +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 1F577180B464; Mon, 10 May 2021 19:08:07 +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 14AJ86IP005914 for ; Mon, 10 May 2021 15:08:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79A0193262; Mon, 10 May 2021 19:08:06 +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 CCEE88CAB7; Mon, 10 May 2021 19:08:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620673755; 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=OA1pOjkdehVyXBH2+6ikQimAJTy1v6yw22mJ91vIqVM=; b=g00sGD7C8+xMn5/RKTAOtK4+m0+54JCA6cs+TGArnHmjt9DCJF2fCTlMTCpXRxRgHE/2v4 TZ0FSN+gtT4CSoMKutrd95x89gbQhNauhwzoEc1WcFVWBsvhjaHdmZXQweqNvMnG3AXpAP OLAxcpu6gZuo2N2uuGol2VvXJ4Kkn5M= X-MC-Unique: NESMbnvzPUWnfLn7YpKMbQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] gitlab: only print failed tests in codestyle job Date: Mon, 10 May 2021 20:07:58 +0100 Message-Id: <20210510190801.945694-2-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.79 on 10.5.11.15 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) "meson test" will only print a list of which tests fail by default, so we were sending the full test log to stdout on failure. This makes it really hard to see the errors though as the test log has all succcesful tests too. "ninja test" will print the same as "meson test", following by details of each failure. It does this using the "--print-errorlog" flag, so lets use that in the codestyle job. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89f618e678..cf0ce268b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -555,7 +555,7 @@ codestyle: script: - meson 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 || (cat build/= meson-logs/testlog.txt && exit 1) + - meson test -C build --suite syntax-check --no-rebuild --print-errorl= ogs =20 =20 # This artifact published by this job is downloaded to push to Weblate --=20 2.31.1 From nobody Wed May 15 04:47:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1620673730; cv=none; d=zohomail.com; s=zohoarc; b=l1Pn8yGbh9+jqO52J3lBmywniLUvXclqBdsIR+SUvouCLg2F45GYta6ZKVgWZ0cEZQRcoH/dGDLeQ+oWzhkog5r9L6TcZmjfFKt7GKzXURhCikDmal//SjQi/vx8WJV8ob8o9hddgFlS9eWTWpgJTl64Q5D9tI+r2MaHh24MiOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620673730; 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=lwGuhMFJWi75cMUUAdD7vM+0iQbIRRID2jFrChR+0PM=; b=ioKwiqFfnd60deTPNaZHVy+jqu02fol6ZtwAQHpLce1dUloWrVXT2UimKj+EeN3aJBN43Of+MRKcl8jsfXE6REtjeAhLxWpUPlO92/v0bP/A8QlAiub/D4PMOcpJbjwkNiwYgX8wxAWRZ9GUhJoritCuAUtZaqTRzSQOAPSORLc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620673730767289.1208228218127; Mon, 10 May 2021 12:08:50 -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-580-fGZqvRuUMFeNlKbL3xmS_Q-1; Mon, 10 May 2021 15:08:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7AA81106BAE9; 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 3510A60BF1; 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 E67905535E; 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 14AJ89vY005929 for ; Mon, 10 May 2021 15:08:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 927FC841B5; Mon, 10 May 2021 19:08:08 +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 3EE996E520; Mon, 10 May 2021 19:08:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620673729; 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=lwGuhMFJWi75cMUUAdD7vM+0iQbIRRID2jFrChR+0PM=; b=SmuQN8hfPYVVkJ16pMXZqIAG5FMuOVBhydE486jXzVYVPkAwULu9PcZ4LQ5647uLNmI9Fz q5ZSnaDqO0bSRxDzrHH8ITb7mW4kpFlsJSDeCuFEt5FQ8cq/V+c4FmWqtKKtPEhNcbatbh XCuUSXi5UiQbDJGNGD52iBngvHhUZ1Y= X-MC-Unique: fGZqvRuUMFeNlKbL3xmS_Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] gitlab: remove ability to skip 'ninja dist' Date: Mon, 10 May 2021 20:07:59 +0100 Message-Id: <20210510190801.945694-3-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.79 on 10.5.11.12 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=3Dskip" 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 Date: Tue May 4 10:45:29 2021 +0200 ci: Drop CentOS 7 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- .gitlab-ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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" !=3D "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" !=3D "skip"; then rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz; --=20 2.31.1 From nobody Wed May 15 04:47:12 2024 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 Reviewed-by: Michal Privoznik --- .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 From nobody Wed May 15 04:47:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1620673763; cv=none; d=zohomail.com; s=zohoarc; b=QHw6pQ9vcRFlkd0YcywVthfde44l+XRKvWcFERay2UVjUWDaEGhvFQ/nXNgLC6rMB5xmsS6MjgzvEWc4YE4c2cL+w8ds0VWPgbubg5bMZejeDm7WI9Xv+qfWr85RP+Khwv3JNcPwz2nmQUcBgVvDgLFWifnxuWXfXDF+CgsvQxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620673763; 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=GkSx/t3zsmwpmTrbGd5dhLcc1a4fq23y+YYvArVAvqg=; b=O0khWMlxmRUIAXagP2hD3N3cCn/Wm4AL8dW3tOu4n2rzPWfnc4X4IGRWnc5mk3/PGZhSle6dcQvP2Umh1NibWvXoRToriRaiVx1hTbiTqAqTSJnALTI3fJJw0gvsVSUjTQ4vaeBNXM3KI9T7VQsVBiSdLXgWfc+fcJWzRdkE4Tc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620673763742351.1397383630276; Mon, 10 May 2021 12:09:23 -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-590-iHUQM5ogO1WSRZOnVnPG6w-1; Mon, 10 May 2021 15:09:20 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B94506BD65; Mon, 10 May 2021 19:08:17 +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 4DF7174776; Mon, 10 May 2021 19:08:17 +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 1539B5535C; Mon, 10 May 2021 19:08:17 +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 14AJ8Ewq005954 for ; Mon, 10 May 2021 15:08:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id D8C768545C; Mon, 10 May 2021 19:08:13 +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 AAE5094C7C; Mon, 10 May 2021 19:08:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620673762; 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=GkSx/t3zsmwpmTrbGd5dhLcc1a4fq23y+YYvArVAvqg=; b=SdzKJIkF/Y82t+YLh60ejFNuYRJokkGZ9oxTz6h/k406LEp9WX4QqDjv2+6ppIchljBvb/ M5hTPv18DNjXIeHMBZQrOMwK3adz1qbD3/VBxnk1mduLnS1fictNvZxxJ5+14EwOGYKHHH mLIB3jktxSFQaOzgcLWzPmxfsjplCtk= X-MC-Unique: iHUQM5ogO1WSRZOnVnPG6w-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] gitlab: avoid building libvirt twice and running syntax-check twice Date: Mon, 10 May 2021 20:08:01 +0100 Message-Id: <20210510190801.945694-5-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.79 on 10.5.11.11 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) In the distros using RPMs, we build libvirt once as a side effect of running "ninja dist", and once via rpmbuild. In addition "ninja dist" will run all tests including the "syntax-check" suite, despite use having a separate "codestyle" job for for that. There is no way to pass "--no-suite" when creating the dist, but if we switch to invoking "meson dist", we can skip the build+test part entirely using "--no-tests". When doing this we then run explicit "meson compile" and "meson test" commands for the distros that don't build the RPMs, and in the latter case we can now skip the "syntax-check" suite. The RPM builds already skipped the "syntax-check" suite. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- .gitlab-ci.yml | 7 +++++-- ci/cirrus/build.yml | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dfbd0ca54..11a201563f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,10 +61,13 @@ stages: - *script_variables script: - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - - meson dist -C build + - meson dist -C build --no-tests - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then rpmbuild --nodeps -ta build/meson-dist/libvirt-*.tar.xz; + else + meson compile -C build; + meson test -C build --no-suite syntax-check --print-errorlogs; fi =20 # Jobs that we delegate to Cirrus CI because they require an operating @@ -124,7 +127,7 @@ stages: script: - 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 + - if test "$CROSS" =3D "i686" ; then meson test -C build --no-suite sy= ntax-check --print-errorlogs ; fi =20 =20 # Native container build jobs diff --git a/ci/cirrus/build.yml b/ci/cirrus/build.yml index c9420a8d91..39c17dc08a 100644 --- a/ci/cirrus/build.yml +++ b/ci/cirrus/build.yml @@ -23,4 +23,6 @@ build_task: - git reset --hard "$CI_COMMIT_SHA" build_script: - meson setup build - - meson dist -C build + - meson dist -C build --no-tests + - meson compile -C build + - meson test -C build --no-suite syntax-check --=20 2.31.1