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.
pull/7255/head
Jason Ish 4 years ago committed by Victor Julien
parent 57a6f30431
commit ad9c8fab25

@ -73,6 +73,8 @@ jobs:
- uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748
with: with:
fetch-depth: 0 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 fetch
- run: git clone https://github.com/OISF/libhtp -b 0.5.x - run: git clone https://github.com/OISF/libhtp -b 0.5.x
- name: Building all commits - name: Building all commits

@ -95,7 +95,8 @@ jobs:
# does not know the branch (from the forked repo). Argh. # does not know the branch (from the forked repo). Argh.
# with: # with:
# ref: ${{ github.head_ref }} # check out branch # 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 # 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 # with actions/checkout seemed to work for pull requests from forks into
# the OISF repo. # the OISF repo.

Loading…
Cancel
Save