From patchwork Mon Nov 21 17:52:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1707530 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=BQtyxerr; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NGFNP62Rnz23lT for ; Tue, 22 Nov 2022 04:52:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9AEE2853B7; Mon, 21 Nov 2022 18:52:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="BQtyxerr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0FAD285407; Mon, 21 Nov 2022 18:52:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6523A8539C for ; Mon, 21 Nov 2022 18:52:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qk1-x72e.google.com with SMTP id s20so8555689qkg.5 for ; Mon, 21 Nov 2022 09:52:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=QbIy1BM5vqU/R/O/daBhvdICf/lSQz1H2tTs73W40Zo=; b=BQtyxerrHXoc4uFAj4jiWjgkN/snQ+6Y4WeLJQJrqH23Es6M/CbJTSevP6Ku1XdIMb dSJVDv4x4UQP/nOnRFG9RqwJdMEUPh+qDuyQrztYSDH2mhioSgErN5eg4U6YA8Q0+VWF 9HfRLzmroutN9i4yALHh/vm7uqbMPBVW2qdHI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=QbIy1BM5vqU/R/O/daBhvdICf/lSQz1H2tTs73W40Zo=; b=uE2FhjWhByqYkIQOdkA7XkCfLWTek3fWChWGWUsktxKKdKxeVs2Bc5owYsWJvLQsMw UzuyU9z6NHHY+6uv2fSykc1c1X+oRMfpqqPpI8eo1bLcTAqpzyXjj/i3YCL//v/sBpvf JobXFrVyVl/nxy1ScqLE4cXwwu9wtkvcL8bU3L7MjDvAQcSgHZZbPgsLTSFf34srMPHp ePWg2+2n8/tR4hKFBGqc5s4y4nRRUNDbUuKALnkOsBkrBTvNy9Ob6yNv1EVnx2XT/+DM /0UdvlplvFX+PRa9vWHSqjNpCoJnqWhkXsHJs6IHzZiO9Xr4fomuOGhnK4zMTmv3ew/X b15g== X-Gm-Message-State: ANoB5pmUFjjLOiTplMjF9ekN1lrStQQ85nQg4T+d1RSRzAwDo62to2J9 lzwU9TlXZv2diBAnfqkV7xfOY1iTDj8ZSA== X-Google-Smtp-Source: AA0mqf50dhAWbDWdonKzcvPxYQtZKhM/RrGwePxDc28rrOgiHLH7aHt2kfDkxutKdC+mmn4QijZJAg== X-Received: by 2002:ae9:eb41:0:b0:6fb:9b7e:7e5b with SMTP id b62-20020ae9eb41000000b006fb9b7e7e5bmr17762040qkg.483.1669053162027; Mon, 21 Nov 2022 09:52:42 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-91a3-6c7b-3405-8039.res6.spectrum.com. [2603:6081:7b00:6400:91a3:6c7b:3405:8039]) by smtp.gmail.com with ESMTPSA id ey10-20020a05622a4c0a00b003a5fb681ae7sm6989712qtb.3.2022.11.21.09.52.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 09:52:41 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH] CI: Make more use of git safe.directory Date: Mon, 21 Nov 2022 12:52:40 -0500 Message-Id: <20221121175240.1269577-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean We have a number of jobs that will have git complain about needing to set safe.directory and this being untrue as a fatal error, but then complete. Set this flag correctly now as it should be used, and may prevent a future failure. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- .azure-pipelines.yml | 2 ++ .gitlab-ci.yml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 4928d3abac7d..80b0b2c5d003 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -362,6 +362,7 @@ stages: cat << "EOF" >> test.sh # the below corresponds to .gitlab-ci.yml "before_script" cd ${WORK_DIR} + git config --global --add safe.directory ${WORK_DIR} git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname` ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` @@ -551,6 +552,7 @@ stages: export BUILDMAN="${BUILDMAN}" EOF cat << "EOF" >> build.sh + git config --global --add safe.directory ${WORK_DIR} if [[ "${BUILDMAN}" != "" ]]; then ret=0; tools/buildman/buildman -o /tmp -P -E -W ${BUILDMAN} ${OVERRIDE} || ret=$?; diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36a274dac52f..dbb8990af50c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ stages: stage: test.py before_script: # Clone uboot-test-hooks + - git config --global --add safe.directory "${CI_PROJECT_DIR}" - git clone --depth=1 https://source.denx.de/u-boot/u-boot-test-hooks /tmp/uboot-test-hooks - ln -s travis-ci /tmp/uboot-test-hooks/bin/`hostname` - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` @@ -81,6 +82,7 @@ build all 32bit ARM platforms: stage: world build script: - ret=0; + git config --global --add safe.directory "${CI_PROJECT_DIR}"; ./tools/buildman/buildman -o /tmp -P -E -W arm -x aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; @@ -93,6 +95,7 @@ build all 64bit ARM platforms: - virtualenv -p /usr/bin/python3 /tmp/venv - . /tmp/venv/bin/activate - ret=0; + git config --global --add safe.directory "${CI_PROJECT_DIR}"; ./tools/buildman/buildman -o /tmp -P -E -W aarch64 || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; @@ -103,6 +106,7 @@ build all PowerPC platforms: stage: world build script: - ret=0; + git config --global --add safe.directory "${CI_PROJECT_DIR}"; ./tools/buildman/buildman -o /tmp -P -E -W powerpc || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP; @@ -113,6 +117,7 @@ build all other platforms: stage: world build script: - ret=0; + git config --global --add safe.directory "${CI_PROJECT_DIR}"; ./tools/buildman/buildman -o /tmp -P -E -W -x arm,powerpc || ret=$?; if [[ $ret -ne 0 ]]; then ./tools/buildman/buildman -o /tmp -seP;