From patchwork Thu Apr 2 13:04:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11470687 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC411159A for ; Thu, 2 Apr 2020 13:04:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBC66206F5 for ; Thu, 2 Apr 2020 13:04:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bJ9ome+F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388167AbgDBNEf (ORCPT ); Thu, 2 Apr 2020 09:04:35 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:34725 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729033AbgDBNEf (ORCPT ); Thu, 2 Apr 2020 09:04:35 -0400 Received: by mail-pf1-f194.google.com with SMTP id 23so1737399pfj.1 for ; Thu, 02 Apr 2020 06:04:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F/05iEFWX5JXC5UQTYfzsFMJZ0Wb9bXyAbm9U1echHc=; b=bJ9ome+F32mgtHffonhc7VuFDb5MZ22n/lMbKqc/ykc5uxNNTM2vDz3/sLdi6YI7FQ 15a02xVaF0yxuQO0zLdusaWcECapDiM5hrvzT+D8ZpVwnR68NNWJF5PfpmwQbwP/Q+Ie /X3XgDaaSj4vKbA/9J7+CcbXs35ByKyqm+l2motVBuPZ/v4IciqPhi7jUQktoM66kPOH 6h0lu9KF9OxTuSMKomdo3381QxD9OZK1x2eoK0VAtnIK9YuYK/Uo6FAPA9WkcJGfjTJO 4bdIIuU0ZLkcn3DdSxJTBXNZRRXEJ5MAfC/HBfAThJE6N1lMFhV651yY1sG/OcmhI0WL jTyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F/05iEFWX5JXC5UQTYfzsFMJZ0Wb9bXyAbm9U1echHc=; b=AxzzkrJRTFN7cc8wONToxhQ0jvL1LhP0uDFbCTKxyPdip8Bg7vynV+wHPosBa0oGQC UT6KAXcPyJWJ3YfICHQa0rKgq8rDOoXcy6mKczDhyIdLm2YGbMzwoSXRmoei7CXc6Kif F1QdLI/V0J51eiUA0Gokw5Z44Vw56Nki7Idihfe45SzqDY/0QD9ZRCN8pgbbJXM/i0R3 ysVWdgyp5jmLb5UoLoGeYWDcPdIfnKjX8CyYWZukpI6YQwZQ6SFnra/y0+laBcvI2Zz+ /AlyuiN+a0Hkx8UIMJtyZId+fW+np7LNpgVwn7hExhegYgeWOt+oJcpDcmrQV3eIzBT7 Xqiw== X-Gm-Message-State: AGi0Pual/cFCv5xb9PmTz3+Q0gEHCytwPzHwLn5JP/h0LAsLXOMO/XES za/CC+Lu0DkfocM8JLYR/A+9oATZ X-Google-Smtp-Source: APiQypKOf0KI7tjO0A2c/yPIzhYjrwGBACyiPy+XhqxZLk0KGer0z/dsnjBCauvSI/15+c4YqOhbJg== X-Received: by 2002:a62:fc07:: with SMTP id e7mr3115804pfh.299.1585832674074; Thu, 02 Apr 2020 06:04:34 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id o15sm3371124pgj.60.2020.04.02.06.04.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Apr 2020 06:04:33 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?q?SZEDER_G=C3=A1bor?= , =?utf-8?b?xJBvw6Bu?= =?utf-8?b?IFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v3 1/6] ci: make MAKEFLAGS available inside the Docker container in the Linux32 job Date: Thu, 2 Apr 2020 20:04:00 +0700 Message-Id: <2fdce60075935f8ff94bc117747f1768f41ed435.1585832270.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: SZEDER Gábor Once upon a time we ran 'make --jobs=2 ...' to build Git, its documentation, or to apply Coccinelle semantic patches. Then commit eaa62291ff (ci: inherit --jobs via MAKEFLAGS in run-build-and-tests, 2019-01-27) came along, and started using the MAKEFLAGS environment variable to centralize setting the number of parallel jobs in 'ci/libs.sh'. Alas, it forgot to update 'ci/run-linux32-docker.sh' to make MAKEFLAGS available inside the Docker container running the 32 bit Linux job, and, consequently, since then that job builds Git sequentially, and it ignores any Makefile knobs that we might set in MAKEFLAGS (though we don't set any for the 32 bit Linux job at the moment). So update the 'docker run' invocation in 'ci/run-linux32-docker.sh' to make MAKEFLAGS available inside the Docker container as well. Set CC=gcc for the 32 bit Linux job, because that's the compiler installed in the 32 bit Linux Docker image that we use (Travis CI nowadays sets CC=clang by default, but clang is not installed in this image). Signed-off-by: SZEDER Gábor Signed-off-by: Đoàn Trần Công Danh --- ci/lib.sh | 3 +++ ci/run-linux32-docker.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/ci/lib.sh b/ci/lib.sh index c3a8cd2104..d637825222 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -198,6 +198,9 @@ osx-clang|osx-gcc) GIT_TEST_GETTEXT_POISON) export GIT_TEST_GETTEXT_POISON=true ;; +Linux32) + CC=gcc + ;; esac MAKEFLAGS="$MAKEFLAGS CC=${CC:-cc}" diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh index 751acfcf8a..ebb18fa747 100755 --- a/ci/run-linux32-docker.sh +++ b/ci/run-linux32-docker.sh @@ -20,6 +20,7 @@ docker run \ --env GIT_PROVE_OPTS \ --env GIT_TEST_OPTS \ --env GIT_TEST_CLONE_2GB \ + --env MAKEFLAGS \ --env cache_dir="$container_cache_dir" \ --volume "${PWD}:/usr/src/git" \ --volume "$cache_dir:$container_cache_dir" \