From nobody Mon Feb 9 12:43:20 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1698965926623986.6312426349052; Thu, 2 Nov 2023 15:58:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8574C1840; Thu, 2 Nov 2023 18:58:45 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1FC7218A6; Thu, 2 Nov 2023 18:38:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 070B7181C; Thu, 2 Nov 2023 18:37:51 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8EF74175B for ; Thu, 2 Nov 2023 18:37:45 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-572-fG8xcS-FOuqgO16-06Lf9g-1; Thu, 02 Nov 2023 18:37:43 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 906231C05AED for ; Thu, 2 Nov 2023 22:37:43 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.45.224.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 28DDE25C0 for ; Thu, 2 Nov 2023 22:37:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: fG8xcS-FOuqgO16-06Lf9g-1 From: Andrea Bolognani To: devel@lists.libvirt.org Subject: [libvirt PATCH 11/11] ci: Build RPMs on MinGW Date: Thu, 2 Nov 2023 23:37:33 +0100 Message-ID: <20231102223733.520214-12-abologna@redhat.com> In-Reply-To: <20231102223733.520214-1-abologna@redhat.com> References: <20231102223733.520214-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: L6FY356V5E6PJ2IEFNOIJEMGZL34QP3H X-Message-ID-Hash: L6FY356V5E6PJ2IEFNOIJEMGZL34QP3H X-MailFrom: abologna@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1698965926900100001 Now that the spec file supports selectively disabling the native, mingw32 and mingw64 parts, we can add coverage for the MinGW RPM builds. Signed-off-by: Andrea Bolognani --- .gitlab-ci.yml | 11 ++++++++--- ci/jobs.sh | 19 ++++++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cdabed941..42c43a556e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,10 +57,15 @@ include: key: "$CI_JOB_NAME" script: - source ci/jobs.sh - - run_build - - if test "$CROSS" =3D "i686" ; + - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then - run_test; + run_rpmbuild; + else + run_build; + if test "$CROSS" =3D "i686"; + then + run_test; + fi; fi =20 .cross_build_job_prebuilt_env: diff --git a/ci/jobs.sh b/ci/jobs.sh index ba522258a1..8f7748aab8 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -72,10 +72,27 @@ run_potfile() { =20 run_rpmbuild() { run_dist + + case "$CROSS" in + mingw32) + without_feature1=3D"_without_native 1" + without_feature2=3D"_without_mingw64 1" + ;; + mingw64) + without_feature1=3D"_without_native 1" + without_feature2=3D"_without_mingw32 1" + ;; + *) + without_feature1=3D"_without_mingw32 1" + without_feature2=3D"_without_mingw64 1" + ;; + esac + run_cmd rpmbuild \ --clean \ --nodeps \ - --define "_without_mingw 1" \ + --define "$without_feature1" \ + --define "$without_feature2" \ -ta build/meson-dist/libvirt-*.tar.xz } =20 --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org