github-ci: set safe directory before reset

While the latest checkout action does set the "safe.directory"
parameter, it doesn't appear to stick for the following "git fetch", so
call this command again.

diff --git a/.github/workflows/commits.yml b/.github/workflows/commits.yml
index 27909bff7d953b08c3eefd3a9ac301ef642b26d5..a349aed0191ff0f54b25297be87844cceb8f21d1 100644 (file)
--- a/.github/workflows/commits.yml
+++ b/.github/workflows/commits.yml
@@ -73,6 +73,8 @@ jobs:
       - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
         with:
           fetch-depth: 0
+      # The action above is supposed to do this for us, but it doesn't appear to stick.
+      - run: /usr/bin/git config --global --add safe.directory /__w/suricata/suricata
       - run: git fetch
       - run: git clone https://github.com/OISF/libhtp -b 0.5.x
       - name: Building all commits

diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 1ff80e5f3c285f0f4f82d060ef4ea41f4adc63d5..812a093f8fa12ab2a4ea20188f5aa9977ca1f0b4 100644 (file)
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -95,7 +95,8 @@ jobs:
         # does not know the branch (from the forked repo). Argh.
 #        with:
 #          ref: ${{ github.head_ref }} # check out branch
-
+      # The action above is supposed to do this for us, but it doesn't appear to stick.
+      - run: /usr/bin/git config --global --add safe.directory /__w/suricata/suricata
       # Manually ignore the merge commit as none of the with/ref things tried
       # with actions/checkout seemed to work for pull requests from forks into
       # the OISF repo.