ci: Move git config ... to run-in-docker-action

BlockstreamResearch · Aug 23, 2023 · 317a4c4 · 317a4c4
1 parent 4d7fe60
commit 317a4c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/actions/run-in-docker-action/action.yml b/.github/actions/run-in-docker-action/action.yml
@@ -41,5 +41,8 @@ runs:
           $(echo '${{ toJSON(env) }}' | jq -r 'keys[] | "--env \(.) "') \
           --volume ${{ github.workspace }}:${{ github.workspace }} \
           --workdir ${{ github.workspace }} \
-          ${{ inputs.tag }} bash -c "${{ inputs.command }}"
+          ${{ inputs.tag }} bash -c "
+            git config --global --add safe.directory ${{ github.workspace }}
+            ${{ inputs.command }}
+          "
       shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -105,7 +105,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -156,7 +155,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -203,7 +201,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -258,7 +255,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -305,7 +301,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -352,7 +347,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -409,7 +403,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -467,7 +460,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -526,7 +518,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -583,7 +574,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true
@@ -747,7 +737,6 @@ jobs:
           dockerfile: ./ci/linux-debian.Dockerfile
           tag: linux-debian-image
           command: >
-            git config --global --add safe.directory ${{ github.workspace }} &&
             ./ci/ci.sh
 
       - run: cat tests.log || true