From nobody Sun Feb 8 12:37:43 2026 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 --- .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