diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-12-23 09:32:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-23 09:32:15 -0800 |
| commit | bad5d1ad25f2bfb65e3ad51fd300fe8091431acd (patch) | |
| tree | b54cfc479062ab53e3b94d2480cddca39b2ff3cd | |
| parent | 8cad35f3535fa6724b80aada2dbd6f244ff88819 (diff) | |
| parent | 55d62306eeada186154fd538cb79efd579f7d9f6 (diff) | |
| download | git-bad5d1ad25f2bfb65e3ad51fd300fe8091431acd.tar.xz | |
Merge branch 'js/github-windows-setup-fix'
Revert recent changes to the way windows environment is set up for
GitHub CI.
* js/github-windows-setup-fix:
GitHub ci(windows): speed up initializing Git for Windows' minimal SDK again
| -rw-r--r-- | .github/workflows/main.yml | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 808ddc19b8..1c0aa56b16 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,15 +113,13 @@ jobs: cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} steps: - uses: actions/checkout@v4 - - name: setup SDK - shell: powershell - run: ci/install-sdk.ps1 + - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: build - shell: powershell + shell: bash env: HOME: ${{runner.workspace}} NO_PERL: 1 - run: git-sdk/usr/bin/bash.exe -l -c 'ci/make-test-artifacts.sh artifacts' + run: . /etc/profile && ci/make-test-artifacts.sh artifacts - name: zip up tracked files run: git archive -o artifacts/tracked.tar.gz HEAD - name: upload tracked files and build artifacts @@ -149,12 +147,10 @@ jobs: - name: extract tracked files and build artifacts shell: bash run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz - - name: setup SDK - shell: powershell - run: ci/install-sdk.ps1 + - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: test - shell: powershell - run: git-sdk/usr/bin/bash.exe -l -c 'ci/run-test-slice.sh ${{matrix.nr}} 10' + shell: bash + run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10 - name: print test failures if: failure() && env.FAILED_TEST_ARTIFACTS != '' shell: bash |