From 90668adf682953baf89bdf17b1ee65ae22e11b1e Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Wed, 8 Jun 2022 12:25:05 -0400 Subject: [PATCH] [libc++] Make sure we add /llvm to the list of safe directories With the new version of Git in Ubuntu Jammy (which is now what we use in our Docker image), we need to add `/llvm` to the list of safe directories to avoid failures. --- libcxx/utils/ci/run-buildbot-container | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libcxx/utils/ci/run-buildbot-container b/libcxx/utils/ci/run-buildbot-container index 5d975ebfc4f4..07fb2706beb2 100755 --- a/libcxx/utils/ci/run-buildbot-container +++ b/libcxx/utils/ci/run-buildbot-container @@ -27,4 +27,5 @@ if [[ ! -d "${MONOREPO_ROOT}/libcxx/utils/ci" ]]; then exit 1 fi docker pull ldionne/libcxx-builder -docker run -it --volume "${MONOREPO_ROOT}:/llvm" --workdir "/llvm" --cap-add=SYS_PTRACE ldionne/libcxx-builder bash +docker run -it --volume "${MONOREPO_ROOT}:/llvm" --workdir "/llvm" --cap-add=SYS_PTRACE ldionne/libcxx-builder \ + bash -c 'git config --global --add safe.directory /llvm ; exec bash'