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
maint
Junio C Hamano 2021-10-18 15:47:58 -07:00
commit ada1a17261
1 changed files with 3 additions and 3 deletions

View File

@ -88,7 +88,7 @@ jobs:
env: env:
HOME: ${{runner.workspace}} HOME: ${{runner.workspace}}
NO_PERL: 1 NO_PERL: 1
run: ci/make-test-artifacts.sh artifacts run: . /etc/profile && ci/make-test-artifacts.sh artifacts
- name: zip up tracked files - name: zip up tracked files
run: git archive -o artifacts/tracked.tar.gz HEAD run: git archive -o artifacts/tracked.tar.gz HEAD
- name: upload tracked files and build artifacts - name: upload tracked files and build artifacts
@ -115,7 +115,7 @@ jobs:
- uses: git-for-windows/setup-git-for-windows-sdk@v1 - uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: test - name: test
shell: bash 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 - name: ci/print-test-failures.sh
if: failure() if: failure()
shell: bash shell: bash
@ -198,7 +198,7 @@ jobs:
shell: bash shell: bash
env: env:
NO_SVN_TESTS: 1 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 - name: ci/print-test-failures.sh
if: failure() if: failure()
shell: bash shell: bash