Re: [PATCH] GitHub ci(windows): speed up initializing Git for Windows' minimal SDK again
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 17, 2024, 20:33 UTC
- Message-ID
- <xmqqldweyrqx.fsf@gitster.g>
- In-Reply-To
- <pull.1841.git.1734447458896.gitgitgadget@gmail.com>
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:
> This commit partially reverts 91839a88277 (ci: create script to set up > Git for Windows SDK, 2024-10-09).
Thanks, will queue.
Show 41 quoted lines
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> index 9301a1edd6d..916a64b6736 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
>
> base-commit: 631ddbbcbd912530e1b78e5d782e72879f7f1fb2