From nobody Sat Feb 7 07:31:06 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=1675691652; cv=none; d=zohomail.com; s=zohoarc; b=EiWKJ9Dh+6Ls45+MrQMHNQlPlnAHrWoAH4JbteyWKfLDaIoO7j7BsK7lf0bzMcQPZxisf7V7H1jHX8SF5yp7s0EKKgDwD1W45zyMA0m1AlDvWdgAcQOEohHGizUAwZZYSBF7nq34XMfYq4LbM8pW9W/oYvGIU+Tm32BAc0XtmFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675691652; h=Content-Type:Content-Transfer-Encoding:Cc: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=aXiauIzXDMyOcCj6lbEwLIYl9+Ql5gJWcHmin2Ayd3A=; b=QXtmgMW4wDcFWiSQPav8UeCvq4hNwMO/C6iiBO6Pnu0vR2KpPqeUHfW5dqI+R54oJHQ1SMr2WSNHsDMzxSi221yblxQgogIii6LJwR06SLTUBIPQnjnrdJUeqwpxuxZvZeMpvoaRiaU4uYG/d++5JwXLxvHQEBhZBBwwIpYZi6k= 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) 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 1675691652612263.27816872830215; Mon, 6 Feb 2023 05:54:12 -0800 (PST) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-600-ej9KuRqZO4qzbEPWbaoUNA-1; Mon, 06 Feb 2023 08:53:39 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62A303C10223; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DE3A2166B2A; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3E9DA19465A0; Mon, 6 Feb 2023 13:53:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C568B194658D for ; Mon, 6 Feb 2023 13:53:34 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A97631410F36; Mon, 6 Feb 2023 13:53:34 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-193-197.brq.redhat.com [10.40.193.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25E4C14171C2; Mon, 6 Feb 2023 13:53:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675691651; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=aXiauIzXDMyOcCj6lbEwLIYl9+Ql5gJWcHmin2Ayd3A=; b=Xw9/eYjVLL2zp4n/plXRtk4WGcFtrs8WFz4IrUQvGyClc9q/z4r7Eo0MVHdXy3g8OVFJgu 6gnaQxG6qyJ/4N6wU4ICE2eQTJYqd5UmFwci0c8EcRXYgZaZWotFd6W8nnb0ETSHuKgokC O4xrWAzRiUT+PNQJ/gy1p9W1rI5PcJY= X-MC-Unique: ej9KuRqZO4qzbEPWbaoUNA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH 19/20] gitlab-ci.yml: Adopt job execution via a Bash script Date: Mon, 6 Feb 2023 14:53:16 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Skultety Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675691653716100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Instead of open-coding the script steps like we've done until now, use a shell script. Signed-off-by: Erik Skultety --- .gitlab-ci.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index abd7498058..747209dca9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,14 +26,11 @@ include: key: "$CI_JOB_NAME" script: - *script_variables - - meson setup build --werror $MESON_ARGS || (cat build/meson-logs/meso= n-log.txt && exit 1) - - meson dist -C build --no-tests - if test -x /usr/bin/rpmbuild && test "$RPM" !=3D "skip"; then - rpmbuild --clean --nodeps --define "_without_mingw 1" -ta build/me= son-dist/libvirt-*.tar.xz; + ci/build.sh --rpmbuild; else - meson compile -C build; - meson test -C build --no-suite syntax-check --print-errorlogs; + ci/build.sh --build --test; fi after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; @@ -41,6 +38,8 @@ include: then mv "$HOME"/rpmbuild/RPMS/x86_64/ libvirt-rpms/; fi + variables: + MESON_TEST_ARGS: --no-suite syntax-check --print-errorlogs =20 .native_build_job_prebuilt_env: extends: @@ -59,9 +58,14 @@ include: key: "$CI_JOB_NAME" script: - *script_variables - - 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 --no-suite sy= ntax-check --print-errorlogs ; fi + - ci/build.sh --build + - if test "$CROSS" =3D "i686" ; + then + ci/build.sh --test; + fi + variables: + MESON_TEST_ARGS: --no-suite syntax-check --print-errorlogs + =20 .cross_build_job_prebuilt_env: extends: @@ -80,8 +84,7 @@ include: .website_job: script: - *script_variables - - meson setup build --werror -Dsystem=3Dtrue || (cat build/meson-logs/= meson-log.txt && exit 1) - - DESTDIR=3D$(pwd)/install meson compile -C build install-web + - ci/build.sh --website after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - mv install/usr/share/doc/libvirt/html/ website @@ -116,9 +119,7 @@ website_local_env: stage: sanity_checks script: - *script_variables - - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - - meson compile -C build libvirt-pot-dep - - meson test -C build --suite syntax-check --no-rebuild --print-errorl= ogs + - ci/build.sh --codestyle =20 codestyle_prebuilt_env: extends: @@ -159,8 +160,7 @@ potfile: before_script: - *script_variables script: - - meson setup build --werror || (cat build/meson-logs/meson-log.txt &&= exit 1) - - meson compile -C build libvirt-pot-dep libvirt-pot + - ci/build.sh --potfile after_script: - test "$CI_JOB_STATUS" !=3D "success" && exit 1; - cp po/libvirt.pot libvirt.pot --=20 2.39.1