Date: Tue, 5 Dec 2023 19:04:46 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 663e4fa38fe8 - main - Cirrus-CI: fix git usage by build user Message-ID: <202312051904.3B5J4kbQ077243@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=663e4fa38fe835056b24058acc6e43e4a15a84c5 commit 663e4fa38fe835056b24058acc6e43e4a15a84c5 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2023-12-05 19:03:35 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312051904.3B5J4kbQ077243>