From nobody Sat Sep 21 03:17:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) client-ip=209.85.208.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 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=1620660183; cv=none; d=zohomail.com; s=zohoarc; b=buWJ+vYiQwVNn2kyzxTWbNfFkfhbkFMDIbQ9S/A89Wc0aDmhnatt1fAH0nsjDqdc3nudG994f54ey8Vn8p4A78Lx5szZH8QIVLjKKcWVwXTDHf62OajFGaw1E9UC4swWC3UOusthNegllxAxKSTDeO4MGfDbTIE34FXGZsKSzDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620660183; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nV2A80BQTfTwEkyPxurzDKl4dBiQvqh0sXB8LPx2INk=; b=i1ncV4Wf2nbMtkhnxFD4SMDSx7wUTy4tbqjbQtSqV3SUcdfOAAUM27baqG0uitMa0RsvryYnsRSHIsiRPcXBRde7r81VQ3wU+rs785Trnumh6JrjxW7D+7V1Ci4djvdLjCoGbs9UmDAgikCXxXyNcy2mQKuAFp7GSsOvcve9POE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by mx.zohomail.com with SMTPS id 1620660183438980.7733073567573; Mon, 10 May 2021 08:23:03 -0700 (PDT) Received: by mail-ed1-f47.google.com with SMTP id n25so19167103edr.5 for ; Mon, 10 May 2021 08:23:02 -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 j1sm9289547ejv.40.2021.05.10.08.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:23:00 -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=nV2A80BQTfTwEkyPxurzDKl4dBiQvqh0sXB8LPx2INk=; b=KcHYJBpMCzpBr0iUK0LwgF7O+SXdCjc5yIs2PIMuMUH0wTfhW6TFugIcjS3YBUwD/J SU7aTlBd0Y9G+Xdf37NrSdV6kaaoyabtuVN2w0pGrFnky+ch0bmO0pHuTunGTl+Gz8at Xm/ySKIMnHGlvB/62BWIIXIIjA3kEPjaeI+/VWaPq2yFjWwVMHvSoMfVRwh45Ugj/JNT 36wpofW016iX4P7Uym+9LxzEujzGwJ1KefEBwY8//Ht99hFUp8LsrDTNNn0aY+cDcDtQ TEmI0jIhFjwBqNYzNNgROgFo2Zg/d8036CY8gYcZc5xyV0lSoFtoW7qCiw4f5ATVcNHB YrJw== 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=nV2A80BQTfTwEkyPxurzDKl4dBiQvqh0sXB8LPx2INk=; b=GygWkisKTieE4/x7INngjKZY4/gSBUb6AH8S6ptW2oCj+4CNTZibdSzUgySB+5iekB fLj2PCvx0cApMvg8+zlSpngrb+T2vpGz1PhpVJKx+JAuojnjx4i2MT2wszoqj9Edqbol 6Ix1eRddnILD0hHeEpuaJx/zQiVP57Xz01kTisDGU9jHQ7IkD6JUxAik6e5WTSmS4qnn gyCwEytIYWep8Xe6sTIPulO/ckiTPLlMm9pRD51fLdHKfplEt1s2F6IItJVu/501Ysdg TGzGWmjepbwdnrkZ44W3SurkKobyrcreoUQM98p79M9ulmAELZa9ikihheSXfzTiQtrn sZ8g== X-Gm-Message-State: AOAM531Kyo/86YoNssgiGfSdF7P+6Bpri/vrkHtIW3uVM4OKa3kxGz5W j8fem9QadKOtwHI2O2rfz2w= X-Google-Smtp-Source: ABdhPJwENATSAW06PwLWWOPNDWiRA+RMv9y7UIjJjEc2j442Njxc373AWcxpiDK5WMbLWY+UnxExyg== X-Received: by 2002:a05:6402:694:: with SMTP id f20mr30315184edy.93.1620660181370; Mon, 10 May 2021 08:23:01 -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 1/4] gitlab-ci: Extract &environment_variables template Date: Mon, 10 May 2021 17:22:51 +0200 Message-Id: <20210510152254.2543047-2-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) To be able to set the same environment variables to multiple jobs, extract what we currently have as a template. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f01a1dbd7c9..598a8fb096f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,11 +13,14 @@ include: - local: '/.gitlab-ci.d/containers.yml' - local: '/.gitlab-ci.d/crossbuilds.yml' =20 +.environment_variables_template: + before_script: + - JOBS=3D$(expr $(nproc) + 1) + .native_build_job_template: stage: build image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest - before_script: - - JOBS=3D$(expr $(nproc) + 1) + extends: .environment_variables_template script: - mkdir build - cd build --=20 2.26.3 From nobody Sat Sep 21 03:17:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.50 as permitted sender) client-ip=209.85.208.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620660188; cv=none; d=zohomail.com; s=zohoarc; b=lTvRm48yEnt1DgEjebvkFsillKjg26YMTIRgURlj460NO60TgsKcX9P3PePOGZ30Nj/5iEkTUoTJPsAQ0v5eX/HkWI9ymeTgmi4FKekc8BeYHqoonfxg2zEIDq4haugr0mlmiL0auQBzUSeO3eWwWQTE3Lp7DduBBYc+6pTK7Dg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620660188; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pHMQm29tLL67H5oQpTA9QLqlgbtLlPJFehMRIAIMyLw=; b=eb8E3JOdReyweZWJcNcZkEUncSEk3qibLxjPs/k5A9R7gfGSnAeXms7R3pBZj16VQw6hpAJh2fhFVD6ZelpHiyORpZfhl4sb0FT2F//oDXVndBdXs43RQHEKXT2mYLdFOXbxlwLlDc1v0a+6LnOGquLC1lqnJ85MGtROv8TX9Hc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mx.zohomail.com with SMTPS id 1620660188922275.0743230615998; Mon, 10 May 2021 08:23:08 -0700 (PDT) Received: by mail-ed1-f50.google.com with SMTP id v5so8104114edc.8 for ; Mon, 10 May 2021 08:23:07 -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 gn31sm9039814ejc.124.2021.05.10.08.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:23:06 -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=pHMQm29tLL67H5oQpTA9QLqlgbtLlPJFehMRIAIMyLw=; b=uvg7klp7OJ48MviKGyqtd0jzPZIXStlSVDUXIODeT1lCzob6q4Z1V52dRVKM6kvsUD yLep41If8WApMgloIOkpNhM/nN3S3WF7AsiWqHhyrFMd2amYle/dtCE1yNXFM0omB7n6 NNoDY/JChhhIdPCjRYMj8L4uOMNznMjM8CE5N57F9AFXQBHzA6IKXWADky6yfEclyd4c 7qkzbRTfBNl2QPris+WenjUwEyDrwMhwRUmnkY9Oe8I7scM0rL/H2eNZ/7Q48IZRNx7M 8ObbjR9CPGeeG7E++47EqaGRbHm/CGc+kEPHwJQKwVS0R3a4mBxUtthTZ6iBJvxW6nbx I4xQ== 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=pHMQm29tLL67H5oQpTA9QLqlgbtLlPJFehMRIAIMyLw=; b=kvb3uymLO2chY/+0IJRka/oFOvWcoFgStsVWWNnf0TXpahZn9A6lXYRKeCBRqOLvs8 TtjoHqvL/34NLAnGoW6ZEE1IFe6ppsYXX71bYlMHxNJhe/mw7VVG7t4vhHGmFLv6/oMu SuKbsrDxVMsNSX84aBnFanaogAYEo0Qwawk2Tei1Sb3dbXnRx82mvwLKw995rCbxWWZB Z6dLytTQfbnR5O9FqhwuknmykKzXbXIMjO0fDjSK9xuFY4fOaocQUs30f3QUqlxDO4Y+ MFct59/5csHOfwD0rmQWWnRf7n6DCAFYVSwgqdrT24xAzw9nJBT+rnn1HFFhjM4moITP HHtg== X-Gm-Message-State: AOAM532fYMOWLAChbMYG/I6q9PVNW5PjCBCO0nDJoUxB3lzfkf7UOXe/ XYb7Qu6x4M4k+eI1c3nqt/I= X-Google-Smtp-Source: ABdhPJydc5n3hMOw1/abOWegvbIfVRSWlfrj0EzL0lnwPU1yWq0EiGuqTJMaBNuj4hZiN9Ewjga+/Q== X-Received: by 2002:a05:6402:8da:: with SMTP id d26mr30184982edz.161.1620660186599; Mon, 10 May 2021 08:23:06 -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 2/4] gitlab-ci: Adapt JOBS variable for FreeBSD runners Date: Mon, 10 May 2021 17:22:52 +0200 Message-Id: <20210510152254.2543047-3-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) 'nproc' is not available on FreeBSD: $ JOBS=3D$(expr $(nproc) + 1) bash: line 119: nproc: command not found expr: syntax error Instead, use 'sysctl -n hw.ncpu'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 598a8fb096f..aceaac5a398 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,17 @@ include: =20 .environment_variables_template: before_script: - - JOBS=3D$(expr $(nproc) + 1) + - if + test $(uname) =3D "FreeBSD" + ; + then + JOBS=3D$(sysctl -n hw.ncpu) + ; + else + JOBS=3D$(expr $(nproc) + 1) + ; + fi + - echo "=3D=3D=3D Using $JOBS simultaneous jobs =3D=3D=3D" =20 .native_build_job_template: stage: build --=20 2.26.3 From nobody Sat Sep 21 03:17:14 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 From nobody Sat Sep 21 03:17:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.52 as permitted sender) client-ip=209.85.218.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620660199; cv=none; d=zohomail.com; s=zohoarc; b=gNTkSviW8BXl9dnpkzvD6YscvoCy27MFCofFn3thkCgSj0BEwpu62krC7R/dBsJpQqUr9Vhgq+xNPSHAreib7WDPiudh46AsQmioqpA1zVJcaFO/L7YQYvhUX3TMu4s0dxEoWnWbbX9rTg+LWw89byI9b/Iuh54GTl3PUjBA2D4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620660199; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dbG+Q6JY5l/CMiEysJmM0J9wPNN84EDj+3HMZXO10xY=; b=j3VhZbi6l5NfeNZsGRhkmiGS5fGyc0KkqYIdqlqWqtqgAqcE3XcIDn3YjpRYzyswSYOq1gPawe/kAi+/qDxqeZQm+aNGYZRxLVCVh6SlCehy2WKNFGfknnZxAOvjW+ESqay+7QI+E158u7JyOqhRTA+FScWda4skipM+GzXLP3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by mx.zohomail.com with SMTPS id 1620660199290466.000283864934; Mon, 10 May 2021 08:23:19 -0700 (PDT) Received: by mail-ej1-f52.google.com with SMTP id l4so25109655ejc.10 for ; Mon, 10 May 2021 08:23:18 -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 o25sm3952961ejd.70.2021.05.10.08.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 08:23:16 -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=dbG+Q6JY5l/CMiEysJmM0J9wPNN84EDj+3HMZXO10xY=; b=llylqKabZlczpDE8yaQti2o/wGmO/NljXNzE3sZMa5V6gH11lpDVJ+mG5Fu6W2mgXJ TmCWTDzu+wo5cbKttaancmQl6trdaPEL4hVo6IETY7in1erR0PY9dOSZyFlQ0do+MkyT BQqQC6C9D+5ePlYaFG0oRm2t4adma1i+ij9PW132vW44eO6Q5wBdE6Q2+msMV+BIz+Ax /AhvIVAch/Yv8Ja+eKJNKIimrVOzw57JKUhCgw8mcZMrbCr9PMZWVPl/lV/SXWHupGfn Czo6azhpgdRnsrEnhLO/mMaz3tOZDaBAHAjXFyNho/xViLp7gz6f51mNWlFuaWO9VRos 0S2w== 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=dbG+Q6JY5l/CMiEysJmM0J9wPNN84EDj+3HMZXO10xY=; b=Tkid3nDRYM29KqwVqwy6ZvqXqel1oKtrv2sbEv0UbPNpC3ZUlLyjPcZGzTwjo9RXrq pCnuiDt3nJcLy6N/5Zle2W8mNn0pp8MOww5bNl4OeYVN4OfQG+yp0wxgNOuuxolRim3h ZETzVEbNf0uzhojUjCjRubVvqu1xnCXx5V8uzZJwJm33Ui32WG2jZkRWDB/h1xndgyvI myyGRixRLsTPl02goCOororfyWumkQikN7VZfCDlk+RKBELs3xliKCYK8iGthkH+LguE j+tm16Fpi2AWlW0C5ZqHauO8fsDA2sRVG5Cu93/XJ3mA2qiTvjSEaZG5bQzquVAC3JFr fbCg== X-Gm-Message-State: AOAM530PQFzwRniVqmmU9a6vJhU/1AtssqFVKy/wSwfxl3T1c27QTNF+ tJSHdjBJGxD4Es23dEAIcss= X-Google-Smtp-Source: ABdhPJxTE5r63hf8eI7wZt/uYaOiCPyEGr1/XyPgXSbJs/98USNILoTAnMp6Cve1iaWQz9nWGwicTQ== X-Received: by 2002:a17:906:33d8:: with SMTP id w24mr25870972eja.28.1620660197029; Mon, 10 May 2021 08:23:17 -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 4/4] gitlab-ci: Add ccache in $PATH and display statistics Date: Mon, 10 May 2021 17:22:54 +0200 Message-Id: <20210510152254.2543047-5-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) If a runner has ccache installed, use it and display statistics at the end of the build. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a33e51bf453..d9a0252c54d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,13 +21,18 @@ include: then MAKE=3Dgmake JOBS=3D$(sysctl -n hw.ncpu) + PATH=3D/usr/local/libexec/ccache:$PATH ; else MAKE=3Dmake JOBS=3D$(expr $(nproc) + 1) + PATH=3D/usr/lib/ccache:/usr/lib64/ccache:$PATH ; fi - echo "=3D=3D=3D Using $JOBS simultaneous jobs =3D=3D=3D" + - if command -v ccache > /dev/null ; then ccache --zero-stats ; fi + after_script: + - if command -v ccache > /dev/null ; then ccache --show-stats ; fi =20 .native_build_job_template: stage: build --=20 2.26.3