From 75d74ccf90792506036c97563a7417ffce785de5 Mon Sep 17 00:00:00 2001
From: Iampete1 <iampete@hotmail.co.uk>
Date: Mon, 22 Jul 2024 18:17:23 +0100
Subject: [PATCH] Actions: enviroment and scripts: fix safe directory

---
 .github/workflows/test_environment.yml | 2 +-
 .github/workflows/test_scripts.yml     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test_environment.yml b/.github/workflows/test_environment.yml
index 9c307ac33f..411fbbd263 100644
--- a/.github/workflows/test_environment.yml
+++ b/.github/workflows/test_environment.yml
@@ -103,7 +103,7 @@ jobs:
             *"archlinux"*)
             cp /etc/skel/.bashrc /root
             cp /etc/skel/.bashrc /github/home
-            git config --global --add safe.directory /__w/ardupilot/ardupilot
+            git config --global --add safe.directory ${GITHUB_WORKSPACE}
             Tools/environment_install/install-prereqs-arch.sh -qy
             ;;
           esac
diff --git a/.github/workflows/test_scripts.yml b/.github/workflows/test_scripts.yml
index b2e0c7bc6d..94559a422a 100644
--- a/.github/workflows/test_scripts.yml
+++ b/.github/workflows/test_scripts.yml
@@ -30,4 +30,5 @@ jobs:
           CI_BUILD_TARGET: ${{matrix.config}}
         shell: bash
         run: |
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
           Tools/scripts/build_ci.sh