diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-10-18 15:47:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-18 15:47:58 -0700 |
| commit | ada1a17261d07da5500cbd0b2b023b45f1d87d47 (patch) | |
| tree | e35617a3fa5ea1ad9ca6ad48cc266918d037efe9 | |
| parent | Merge branch 'bs/doc-blame-color-lines' (diff) | |
| parent | ci(windows): ensure that we do not pick up random executables (diff) | |
| download | tgif-ada1a17261d07da5500cbd0b2b023b45f1d87d47.tar.xz | |
Merge branch 'js/windows-ci-path-fix'
The PATH used in CI job may be too wide and let incompatible dlls
to be grabbed, which can cause the build&test to fail. Tighten it.
* js/windows-ci-path-fix:
ci(windows): ensure that we do not pick up random executables
| -rw-r--r-- | .github/workflows/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 59acc35d37..6ed6a9e807 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: env: HOME: ${{runner.workspace}} NO_PERL: 1 - run: 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 @@ -115,7 +115,7 @@ jobs: - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: test shell: bash - run: ci/run-test-slice.sh ${{matrix.nr}} 10 + run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10 - name: ci/print-test-failures.sh if: failure() shell: bash @@ -198,7 +198,7 @@ jobs: shell: bash env: NO_SVN_TESTS: 1 - run: ci/run-test-slice.sh ${{matrix.nr}} 10 + run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10 - name: ci/print-test-failures.sh if: failure() shell: bash |