From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Oct 2021 22:47:58 +0000 (-0700)
Subject: Merge branch 'js/windows-ci-path-fix'
X-Git-Tag: v2.34.0-rc0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ada1a17261d07da5500cbd0b2b023b45f1d87d47;p=thirdparty%2Fgit.git

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
---

ada1a17261d07da5500cbd0b2b023b45f1d87d47
diff --cc .github/workflows/main.yml
index 59acc35d37,4e75701be9..6ed6a9e807
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -198,7 -198,8 +198,7 @@@ jobs
        shell: bash
        env:
          NO_SVN_TESTS: 1
-       run: ci/run-test-slice.sh ${{matrix.nr}} 10
 -        GIT_TEST_SKIP_REBASE_P: 1
+       run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
      - name: ci/print-test-failures.sh
        if: failure()
        shell: bash