From 022d2b08e2c16d9714520c3009191b6cc055b84d Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 12 Apr 2022 15:59:13 -0700 Subject: [PATCH] [CI]Work around new git security measure. This one works. --- util/ci/actions/archlinux-test/Dockerfile | 1 - util/ci/actions/archlinux-test/entrypoint.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/util/ci/actions/archlinux-test/Dockerfile b/util/ci/actions/archlinux-test/Dockerfile index 6732a9b649..ed83c49fe7 100644 --- a/util/ci/actions/archlinux-test/Dockerfile +++ b/util/ci/actions/archlinux-test/Dockerfile @@ -8,6 +8,5 @@ run echo en_US.UTF-8 UTF-8 >> /etc/locale.gen run echo en_GB.UTF-8 UTF-8 >> /etc/locale.gen run echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen run locale-gen -run git config --global --add safe.directory /github/workspace copy entrypoint.sh / entrypoint /entrypoint.sh diff --git a/util/ci/actions/archlinux-test/entrypoint.sh b/util/ci/actions/archlinux-test/entrypoint.sh index aabcc94189..12c82c68a3 100755 --- a/util/ci/actions/archlinux-test/entrypoint.sh +++ b/util/ci/actions/archlinux-test/entrypoint.sh @@ -7,6 +7,7 @@ cd build export TZ="America/Los_Angeles" export PATH="$PATH:/usr/bin/core_perl" export CTEST_OUTPUT_ON_FAILURE=On +git config --global --add safe.directory /github/workspace cmake /github/workspace -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -G Ninja ninja ninja check