From nobody Tue Dec 5 19:04:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sl92Q5WsBz53LH6; Tue, 5 Dec 2023 19:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sl92Q54vCz4FpX; Tue, 5 Dec 2023 19:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701803086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPGuwb8dUTF1IvumOiCRVy6NUfHAkl02b72dI18vkbo=; b=XyTvvh+NJxFk3fLA/IXN5RHUSS+LaaXAsXnpehsEafIQqorJQ7BwjyxNQ2xYVwiQ3HUoTi ksdgEF409/S1iHi4of55p7h3x5E/Yf9Q2vHqgOwyoT5p0JWz7XZZah22oQDoDX8pZAq6aj lUgHZpG4274kPxNJOH2gnVaXte+HGUYS0t2y9venIpm6uI2aK4Bkd4ZZvJtEcczaOptcJp 9MLKlUa0jU+3e7kcSzA84Hq+EZmHJ7oOwiMBcdF4hgCWOVkhUy5v9Nz8G3TBqHp+ibGFQd h4hryvQ4HvM+Ae3F1gOWHYAKNKd5lznfY/bFFq80mkVdWGaApPlGkiwCZCQStg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701803086; a=rsa-sha256; cv=none; b=PlAC/Ajl8owRnaGy7wwfqmlWYKx0+ae6faF4EFFucQ6MWqpFNkAJn0+jT483Gg7zjXPkoM Z/n6lHVnkxZedXnlE0FpA/pqmDLP6y/tmDWvo5dOHgJAfX5aNbJFr8QFl27xTDuZHarQDc eAPWtFfNbOVb2zx+Z+4TcW8YNhMd26OgkadsASeyX2lYy3lOG9nQgrxihRlhO0RKeyo4EO 7UhPiWYwJww7XfOP/+nYU+9DzVgtpPVprhk41btWoG//T/MN1cUAVEo6kx/vLB6Z/AaNxU cM0g3JOLIMxA0v2nZrWONW4hYpB2SlR9IIMEdNY5ppHrabGbjh7moh0122dc6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701803086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oPGuwb8dUTF1IvumOiCRVy6NUfHAkl02b72dI18vkbo=; b=ydbfXo4p8WCKaT2D0P6va8dgXr/kQsVjAb43b9g+XCRFiGdM0oI2bdtrJHYjSa7FiT5vp1 u4CnauoE1r+FFll+QEt7c4AXukcWvcj0/0vhmbRF2ONG/GAQOmi7koVtU70wkaSHMjbmJv arYq+n2HVF6kdpBWOCjt0XlhFU7rjfIu4Bdn++0MjfBczAhOLj2BMxHuYRWkwVaTgM4sQQ 0xgTBYDxEU2IRPPlyevyHL0UcUejnVYcKCcCiVRqRCzPTZJgeS1Vskw1A0Hkot/v83yogs Iin7ueLyOSBbeUokhAX9T/vARLokBEYIOKFyZR3zo90jjKqgF7cdS/+2c5MZjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Sl92Q47w4z6yR; Tue, 5 Dec 2023 19:04:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B5J4kS9077245; Tue, 5 Dec 2023 19:04:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B5J4kbQ077243; Tue, 5 Dec 2023 19:04:46 GMT (envelope-from git) Date: Tue, 5 Dec 2023 19:04:46 GMT Message-Id: <202312051904.3B5J4kbQ077243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 663e4fa38fe8 - main - Cirrus-CI: fix git usage by build user List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 663e4fa38fe835056b24058acc6e43e4a15a84c5 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=663e4fa38fe835056b24058acc6e43e4a15a84c5 commit 663e4fa38fe835056b24058acc6e43e4a15a84c5 Author: Brooks Davis AuthorDate: 2023-12-05 19:03:35 +0000 Commit: Brooks Davis CommitDate: 2023-12-05 19:03:35 +0000 Cirrus-CI: fix git usage by build user The git checkout it owned by root, but builds are run as "user". git refuses to operate in such an environment unless the directory is trusted so make "user" trust it. Fixes CI after 99b8c0c35b0fcc633649209621243d678a13542a. Sponsored by: DARPA Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D42903 --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 18417b52e6c9..8e14dc9c0305 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -80,9 +80,10 @@ task: - gpart show - df -m - pkg --version - - pw useradd user + - pw useradd -n user -m - mkdir -p /usr/obj/$(pwd -P) - chown user:user /usr/obj/$(pwd -P) + - su user -c "git config --global --add safe.directory $(pwd -P)" build_world_script: - su user -c "make -j$(sysctl -n hw.ncpu) ${EXTRA_MAKE_FLAGS} CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld"