Skip to content

Commit 317a4c4

Browse files
committed
ci: Move git config ... to run-in-docker-action
1 parent 4d7fe60 commit 317a4c4

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

.github/actions/run-in-docker-action/action.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,8 @@ runs:
4141
$(echo '${{ toJSON(env) }}' | jq -r 'keys[] | "--env \(.) "') \
4242
--volume ${{ github.workspace }}:${{ github.workspace }} \
4343
--workdir ${{ github.workspace }} \
44-
${{ inputs.tag }} bash -c "${{ inputs.command }}"
44+
${{ inputs.tag }} bash -c "
45+
git config --global --add safe.directory ${{ github.workspace }}
46+
${{ inputs.command }}
47+
"
4548
shell: bash

.github/workflows/ci.yml

-11
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ jobs:
105105
dockerfile: ./ci/linux-debian.Dockerfile
106106
tag: linux-debian-image
107107
command: >
108-
git config --global --add safe.directory ${{ github.workspace }} &&
109108
./ci/ci.sh
110109
111110
- run: cat tests.log || true
@@ -156,7 +155,6 @@ jobs:
156155
dockerfile: ./ci/linux-debian.Dockerfile
157156
tag: linux-debian-image
158157
command: >
159-
git config --global --add safe.directory ${{ github.workspace }} &&
160158
./ci/ci.sh
161159
162160
- run: cat tests.log || true
@@ -203,7 +201,6 @@ jobs:
203201
dockerfile: ./ci/linux-debian.Dockerfile
204202
tag: linux-debian-image
205203
command: >
206-
git config --global --add safe.directory ${{ github.workspace }} &&
207204
./ci/ci.sh
208205
209206
- run: cat tests.log || true
@@ -258,7 +255,6 @@ jobs:
258255
dockerfile: ./ci/linux-debian.Dockerfile
259256
tag: linux-debian-image
260257
command: >
261-
git config --global --add safe.directory ${{ github.workspace }} &&
262258
./ci/ci.sh
263259
264260
- run: cat tests.log || true
@@ -305,7 +301,6 @@ jobs:
305301
dockerfile: ./ci/linux-debian.Dockerfile
306302
tag: linux-debian-image
307303
command: >
308-
git config --global --add safe.directory ${{ github.workspace }} &&
309304
./ci/ci.sh
310305
311306
- run: cat tests.log || true
@@ -352,7 +347,6 @@ jobs:
352347
dockerfile: ./ci/linux-debian.Dockerfile
353348
tag: linux-debian-image
354349
command: >
355-
git config --global --add safe.directory ${{ github.workspace }} &&
356350
./ci/ci.sh
357351
358352
- run: cat tests.log || true
@@ -409,7 +403,6 @@ jobs:
409403
dockerfile: ./ci/linux-debian.Dockerfile
410404
tag: linux-debian-image
411405
command: >
412-
git config --global --add safe.directory ${{ github.workspace }} &&
413406
./ci/ci.sh
414407
415408
- run: cat tests.log || true
@@ -467,7 +460,6 @@ jobs:
467460
dockerfile: ./ci/linux-debian.Dockerfile
468461
tag: linux-debian-image
469462
command: >
470-
git config --global --add safe.directory ${{ github.workspace }} &&
471463
./ci/ci.sh
472464
473465
- run: cat tests.log || true
@@ -526,7 +518,6 @@ jobs:
526518
dockerfile: ./ci/linux-debian.Dockerfile
527519
tag: linux-debian-image
528520
command: >
529-
git config --global --add safe.directory ${{ github.workspace }} &&
530521
./ci/ci.sh
531522
532523
- run: cat tests.log || true
@@ -583,7 +574,6 @@ jobs:
583574
dockerfile: ./ci/linux-debian.Dockerfile
584575
tag: linux-debian-image
585576
command: >
586-
git config --global --add safe.directory ${{ github.workspace }} &&
587577
./ci/ci.sh
588578
589579
- run: cat tests.log || true
@@ -747,7 +737,6 @@ jobs:
747737
dockerfile: ./ci/linux-debian.Dockerfile
748738
tag: linux-debian-image
749739
command: >
750-
git config --global --add safe.directory ${{ github.workspace }} &&
751740
./ci/ci.sh
752741
753742
- run: cat tests.log || true

0 commit comments

Comments
 (0)