From nobody Sat Dec 21 17:48:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1694439871; cv=none; d=zohomail.com; s=zohoarc; b=DQu1LgXK75WVHJHRfuGZGQQdis3U0FuAstaQW/7Frlnnbl4XxCtQbKf+cZZ0I6f/6Xshocdf7D1WtQ/bjgJ2nb+oLaHYJLOLlkALQD2x576wd93jn0gvsGvK9ZuM9CIGzb5dx/ldAKzLAkptqFLJ6wdN8JZslFtIlGUxnilvN94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694439871; 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=noptQ3WlShIvgXxUo9K9QgvXQ8TzKvfjI9AT0FYf1JM=; b=oEqY0+7PFpIMIFSlJJhx+gp1zhpNosYOgmXyPzdVMeFkv96GT+obp8f+B08Ow0G9ZIS9GGYLr4vIW1hgD8L1CgRM0AZ7D2H0pvwhVdPcMN/Uwqjxx1K8etnjCxKuXUJWbUT0LdP8KA0IRDio4dok/v9kQRMZbhaSlIYSfBko55U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1694439871585983.4476566494907; Mon, 11 Sep 2023 06:44:31 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-35-CATmXidIPtil4NB-m-w5KQ-1; Mon, 11 Sep 2023 09:44:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23D04182604C; Mon, 11 Sep 2023 13:44:03 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C4B320268C8; Mon, 11 Sep 2023 13:44:03 +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 129F619451CD; Mon, 11 Sep 2023 13:43:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9105F19452D3 for ; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8C98F200AFA7; Mon, 11 Sep 2023 13:43:49 +0000 (UTC) Received: from orca.home.lan (unknown [10.45.225.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10C33201B070; Mon, 11 Sep 2023 13:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694439870; 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=noptQ3WlShIvgXxUo9K9QgvXQ8TzKvfjI9AT0FYf1JM=; b=Funotuux//O+pbZFNjuMcTrWT/TwnyfmoeJHt+Tc3uKaHsiWdBpqJIev7cKkoo1xzPybY8 eNRxpFUOubT/RFFjDdYM76g18UXHiT0HHC8A8d8ehcA5vqYJzQPyYOkmUQGsssUnGajbah +7Ji2wAAToV/SQK4K1eqRpHpXpDc3oQ= X-MC-Unique: CATmXidIPtil4NB-m-w5KQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Erik Skultety To: libvir-list@redhat.com Subject: [libvirt PATCH v2 14/35] ci: build.sh: Drop direct invocation of meson/ninja commands Date: Mon, 11 Sep 2023 15:43:15 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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.4 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: 1694439872204100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We've moved all invocations to the respective helper function which we'll execute both from gitlab CI jobs and local environments so we don't need to have them on the global level as it would also not work with "sourcing" this file to populate the environment with function definitions. Signed-off-by: Erik Skultety Erik Skultety : Reviewed-by: Daniel P. Berrang=C3=A9 --- ci/build.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index fd326dad8d..ac649ed9a9 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -21,10 +21,7 @@ GIT_ROOT=3D"$(git rev-parse --show-toplevel)" # $MESON_ARGS correspond to meson's setup args, i.e. configure args. It's # populated from a GitLab's job configuration =20 -meson setup build --werror -Dsystem=3Dtrue $MESON_OPTS $MESON_ARGS || \ -(cat build/meson-logs/meson-log.txt && exit 1) - -ninja -C build $NINJA_ARGS +MESON_ARGS=3D"$MESON_ARGS $MESON_OPTS" =20 run_cmd() { printf "\e[32m[RUN COMMAND]: '%s'\e[0m\n" "$*" --=20 2.41.0