Skip to content

Commit 972174e

Browse files
committed
Merge branch 'js/github-windows-setup-fix' into jch
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
2 parents d6cec0b + 55d6230 commit 972174e

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,13 @@ jobs:
113113
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
114114
steps:
115115
- uses: actions/checkout@v4
116-
- name: setup SDK
117-
shell: powershell
118-
run: ci/install-sdk.ps1
116+
- uses: git-for-windows/setup-git-for-windows-sdk@v1
119117
- name: build
120-
shell: powershell
118+
shell: bash
121119
env:
122120
HOME: ${{runner.workspace}}
123121
NO_PERL: 1
124-
run: git-sdk/usr/bin/bash.exe -l -c 'ci/make-test-artifacts.sh artifacts'
122+
run: . /etc/profile && ci/make-test-artifacts.sh artifacts
125123
- name: zip up tracked files
126124
run: git archive -o artifacts/tracked.tar.gz HEAD
127125
- name: upload tracked files and build artifacts
@@ -149,12 +147,10 @@ jobs:
149147
- name: extract tracked files and build artifacts
150148
shell: bash
151149
run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz
152-
- name: setup SDK
153-
shell: powershell
154-
run: ci/install-sdk.ps1
150+
- uses: git-for-windows/setup-git-for-windows-sdk@v1
155151
- name: test
156-
shell: powershell
157-
run: git-sdk/usr/bin/bash.exe -l -c 'ci/run-test-slice.sh ${{matrix.nr}} 10'
152+
shell: bash
153+
run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
158154
- name: print test failures
159155
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
160156
shell: bash

0 commit comments

Comments
 (0)