From patchwork Thu Apr 21 18:23:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12822182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A33A4C433EF for ; Thu, 21 Apr 2022 18:24:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1391344AbiDUS1H (ORCPT ); Thu, 21 Apr 2022 14:27:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1391296AbiDUS0f (ORCPT ); Thu, 21 Apr 2022 14:26:35 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 062EC4B1FF for ; Thu, 21 Apr 2022 11:23:42 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id r4-20020a05600c35c400b0039295dc1fc3so3975005wmq.3 for ; Thu, 21 Apr 2022 11:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1UZG2+FDX/SsTVNX2KhVttTMLEQMgCP4/6H+sdKR6IE=; b=YnqfQUsNVMVabBGK6GZFiHI4mQFeRXmJ+PJLnVbTT7AN7m9n1tC9rEanX7z33B+x3G GYgSrz4BlFuSL79ibNZ+hYIOPFpJGstCfeWhpcQceoFJUuZovOMwr+BkJ17sET1UWpbx SxURpj+ZBTE2TMcgxamXRjl9boIglvkEK5mcWbGkRiU8qXgzS+nOd/6V03ToOeTuTNQ6 EZ9BoiQzsfKauftxYNzYKhaq4DtUz6ux5SsBhzfGBagBsaTVo5tIEHsa2y1cy58RuvLY esF3y1fq48laN1CnuWBYdwVtYNS4+1KgI2vktLsd2lWliT1/bgDZhPdQlbgEDXRdJ1fB aAmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1UZG2+FDX/SsTVNX2KhVttTMLEQMgCP4/6H+sdKR6IE=; b=1k9OxNOey3Yn29Xgq+qvo0lPkxdZtZow4nbbmbNCSsYABxr3DV8/naITv2KOWLJSdb yLLFOUTpcaSgxP1qr8Xi4LENB2Jekzpzc49luA9rDXM983DB5usHiWnX78MkXGlLwsWI cB2feUoTpBeC+CaMlu4FpbUUCxxN4efmF84Hll3+nI7l+RZ6FcTNl1aojiUMtPeEsdIR LDRMtzDqVLQXusV0s19otL4bPqBppg7xZNNa5F5KpRNeGIMyrAeEuaUbI1MykUALLus7 vwWUlvnj5I2Bb8JUoj6UTbsNDk6Ojb6HGq3R4/VpZaLwe3QC5ixwIuK07SDJSHJOifg7 eHtw== X-Gm-Message-State: AOAM5330BkLR3jhJtFqHpSvWstcssNHQvpUo2BAiWFyrWVeeCn2Gs0OB sIXGjof7w0qm8ZAM+83sviwpcpHqGWhuNA== X-Google-Smtp-Source: ABdhPJzZwm0g5za1GGFcyGEe9ks2R7mya9CDhVcmmAmRIdYap6ReVqr225NkminwyXffvpbE78WTzQ== X-Received: by 2002:a05:600c:1d12:b0:391:3cf6:243e with SMTP id l18-20020a05600c1d1200b003913cf6243emr565593wms.137.1650565420336; Thu, 21 Apr 2022 11:23:40 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id k11-20020a5d6d4b000000b0020599079f68sm2909090wri.106.2022.04.21.11.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Apr 2022 11:23:39 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , Taylor Blau , =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?xJBvw6Bu?= =?utf-8?b?IFRy4bqnbiBDw7RuZyBEYW5o?= , =?utf-8?q?Car?= =?utf-8?q?lo_Marcelo_Arenas_Bel=C3=B3n?= , Johannes Schindelin , Victoria Dye , Matheus Tavares , Lars Schneider , Eric Sunshine , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH v5 06/29] CI/lib.sh: stop adding leading whitespace to $MAKEFLAGS Date: Thu, 21 Apr 2022 20:23:01 +0200 Message-Id: X-Mailer: git-send-email 2.36.0.879.g3659959fcca In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In a8c51f77d16 (ci: clear and mark MAKEFLAGS exported just once, 2019-02-07) the assignment of MAKEFLAGS was done up-front to future-proof this code for the bug fixed in 406f93ae488 (ci: make sure we build Git parallel, 2019-02-07). But since 4a6e4b96026 (CI: remove Travis CI support, 2021-11-23) the --jobs=10 has been an invariant here, so let's assign --jobs=$NPROC to the MAKEFLAGS right away, this gets rid of the leading whitespace from the $MAKEFLAGS variable, as it would previously be empty on the first assignment. Signed-off-by: Ævar Arnfjörð Bjarmason --- ci/lib.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index a6cdcfa014b..edf26984aeb 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -26,17 +26,19 @@ check_unignored_build_artifacts () # GitHub Action doesn't set TERM, which is required by tput export TERM=${TERM:-dumb} +# How many jobs to run in parallel? +NPROC=10 + # Clear MAKEFLAGS that may come from the outside world. -export MAKEFLAGS= +export MAKEFLAGS=--jobs=$NPROC if test "$GITHUB_ACTIONS" = "true" then CI_TYPE=github-actions CC="${CC:-gcc}" - export GIT_PROVE_OPTS="--timer --jobs 10" + export GIT_PROVE_OPTS="--timer --jobs $NPROC" export GIT_TEST_OPTS="--verbose-log -x" - MAKEFLAGS="$MAKEFLAGS --jobs=10" test Windows != "$RUNNER_OS" || GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" else