From nobody Sat Sep 21 05:27:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.42 as permitted sender) client-ip=209.85.208.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1620660194; cv=none; d=zohomail.com; s=zohoarc; b=SEIfupBFe2PZ3drVJtheb3/3wwFrtLexNGbs6bdpcpXNqtOOYAlHt8/gGCKDRfhsthWJqWyd/VbwmRYuMOeuNBfOOfsULtrq5aHB4c4hZnIQ1TKyOkhlFn57edjKnofvAu1VjUncEfaMdDSVhQDJbpHpU/0XAmJcNBELlx8ESTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620660194; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7WM56ZeWWX0mtxvGSarYLoOC9hh0ABVIqYRvMpQjC9w=; b=Lqrs6fKBGWvsoZUPxeHxl2OrF2g69KFMT3HhLmmqxVs3qok9U/6O05nARHH8en2ESWuiyerOOoD9axgD4FXGjcdpFr6nzCDYR99GVrnKniNuRTQNcazKysCzH8qD0Va9m4ZmUUiuBKxxu+Q/Vxt53tWQH2zYsOQpz6Mn9s3UOVQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mx.zohomail.com with SMTPS id 1620660194094113.46697701653488; Mon, 10 May 2021 08:23:14 -0700 (PDT) Received: by mail-ed1-f42.google.com with SMTP id j26so15495358edf.9 for ; Mon, 10 May 2021 08:23:13 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id c25sm11726351edt.43.2021.05.10.08.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7WM56ZeWWX0mtxvGSarYLoOC9hh0ABVIqYRvMpQjC9w=; b=oBhH7D33ofNBMD0XL2lVuHJHl+eTWnzDxJMiiI345+YSWUrcTkBT/GcSLtUSGviPE0 /qZuQUJBObmJQJBfg/cbTVtx8SORzLVnHtDQ7VvFGMYNhJhYOtSTszH/p1F4HZwI4XC1 KDXXgV3b0hWSd4aX/N9/e5J0Bmxyo28cPMWFuHgUm/jzcCBhUdAMZhNiQuSkc1zdFBCn hanac2Ht4QiuCaEdVBhFXUUwa4FFzPozimHem+zwlqBrDdvBVIy9cOwwkz7gULlPD1tV kNDF63F/2KM6XXPiVaxPiRAP/31Jp4jccNs4nyOsRQu7kybO06gBI7RGdTCre9a1wl2v 2e1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7WM56ZeWWX0mtxvGSarYLoOC9hh0ABVIqYRvMpQjC9w=; b=s4buqkpogVmg8cwY36CuA8T16qgQGg9vXTCDzzsgWTEziblSqs9nknJ82KiHzZJn1H BKb4Wzsts7pAL3BEyCqhl7pcLgo7VlySUaSRbd81knvHPGAbgQO9OHti3klibhZwG235 VN4FDXCrmXBAJ5PxY6qdqPwqSJ3/ejpPNZx6IbosZQs69wZtYwyCe1aOB+Oa1KC6QpWz Bj6rQsehekVm8tGPnupjfTB4URmEDNjRAu3opQnofu6KXv7W1tgn3DPLa3JUTGTSE00d FCPW6JeQBbxdtGRwixwYhcs/GhlloC9sNps2OGaobtjlWXPK2fCopqoC3JJfKwNyWwiV IjKA== X-Gm-Message-State: AOAM533+LgvqsmD8IqpAhY70wgVJVFnfDbcFUk3LWAJFeRCnAozUj/5T wFWBKSSPWFD3r4RCfHO/6Tk= X-Google-Smtp-Source: ABdhPJzXc1jNlzpXZSTDwC5epilenGozZcGRE1LmMnOW6J8+qJsbgHU6aQM0uhb9pdv6Q2tJaaGNAA== X-Received: by 2002:aa7:db94:: with SMTP id u20mr8594036edt.381.1620660191864; Mon, 10 May 2021 08:23:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Kyle Evans , Warner Losh Subject: [PATCH 3/4] gitlab-ci: Run GNU make via the $MAKE variable Date: Mon, 10 May 2021 17:22:53 +0200 Message-Id: <20210510152254.2543047-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210510152254.2543047-1-f4bug@amsat.org> References: <20210510152254.2543047-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add the $MAKE variable to call GNU make, and set it to 'gmake' on FreeBSD to avoid: $ make -j"$JOBS" make: Unknown modifier ',' make: "/builds/dTyar424/0/qemu/build/Makefile" line 3: Need an operator make: "/builds/dTyar424/0/qemu/build/Makefile" line 4: Missing dependency= operator Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aceaac5a398..a33e51bf453 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,9 +19,11 @@ include: test $(uname) =3D "FreeBSD" ; then + MAKE=3Dgmake JOBS=3D$(sysctl -n hw.ncpu) ; else + MAKE=3Dmake JOBS=3D$(expr $(nproc) + 1) ; fi @@ -44,22 +46,23 @@ include: then meson configure . -Dbackend_max_links=3D"$LD_JOBS" ; fi || exit 1; - - make -j"$JOBS" + - $MAKE -j"$JOBS" - if test -n "$MAKE_CHECK_ARGS"; then - make -j"$JOBS" $MAKE_CHECK_ARGS ; + $MAKE -j"$JOBS" $MAKE_CHECK_ARGS ; fi =20 .native_test_job_template: stage: test image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest + extends: .environment_variables_template script: - scripts/git-submodule.sh update $(sed -n '/GIT_SUBMODULES=3D/ s/.*=3D// p' build/config-host.mak) - cd build - find . -type f -exec touch {} + # Avoid recompiling by hiding ninja with NINJA=3D":" - - make NINJA=3D":" $MAKE_CHECK_ARGS + - $MAKE NINJA=3D":" $MAKE_CHECK_ARGS =20 .acceptance_template: &acceptance_definition cache: @@ -833,17 +836,18 @@ build-tools-and-docs-debian: pages: image: $CI_REGISTRY_IMAGE/qemu/debian-amd64:latest stage: test + extends: .environment_variables_template needs: - job: build-tools-and-docs-debian script: - mkdir -p public # HTML-ised source tree - - make gtags + - $MAKE gtags - htags -anT --tree-view=3Dfiletree -m qemu_init -t "Welcome to the QEMU sourcecode" - mv HTML public/src # Project documentation - - make -C build install DESTDIR=3D$(pwd)/temp-install + - $MAKE -C build install DESTDIR=3D$(pwd)/temp-install - mv temp-install/usr/local/share/doc/qemu/* public/ artifacts: paths: --=20 2.26.3