diff --git a/.github/actions/run-in-docker-action/action.yml b/.github/actions/run-in-docker-action/action.yml index 79cf9d623313c..d357c3cf751c8 100644 --- a/.github/actions/run-in-docker-action/action.yml +++ b/.github/actions/run-in-docker-action/action.yml @@ -9,7 +9,8 @@ inputs: required: true command: description: 'A command to run in a container' - required: true + required: false + default: ./ci/ci.sh runs: using: "composite" steps: @@ -41,5 +42,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 index e1307b99c75b2..441cf41ee92ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,9 +104,6 @@ jobs: with: 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 if: ${{ always() }} @@ -155,9 +152,6 @@ jobs: with: 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 if: ${{ always() }} @@ -202,9 +196,6 @@ jobs: with: 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 if: ${{ always() }} @@ -257,9 +248,6 @@ jobs: with: 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 if: ${{ always() }} @@ -304,9 +292,6 @@ jobs: with: 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 if: ${{ always() }} @@ -351,9 +336,6 @@ jobs: with: 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 if: ${{ always() }} @@ -408,9 +390,6 @@ jobs: with: 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 if: ${{ always() }} @@ -466,9 +445,6 @@ jobs: with: 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 if: ${{ always() }} @@ -525,9 +501,6 @@ jobs: with: 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 if: ${{ always() }} @@ -582,9 +555,6 @@ jobs: with: 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 if: ${{ always() }} @@ -746,9 +716,6 @@ jobs: with: 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 if: ${{ always() }}