ci/win32: remove Strawberry Perl from path

It provides broken tools like diff, patch.

Also fix PATH in test stage
This commit is contained in:
Kacper Michajłow 2024-05-06 03:35:33 +02:00
parent 541e00fcdb
commit 281c66a815
1 changed files with 4 additions and 1 deletions

View File

@ -118,7 +118,8 @@ jobs:
- name: Build - name: Build
id: build id: build
run: | run: |
$env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';' $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' -and `
$_ -ne 'C:\Strawberry\c\bin' }) -join ';'
Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll" Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64" Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"
./ci/build-win32.ps1 ./ci/build-win32.ps1
@ -131,6 +132,8 @@ jobs:
- name: Run meson tests - name: Run meson tests
id: tests id: tests
run: | run: |
$env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' -and `
$_ -ne 'C:\Strawberry\c\bin' }) -join ';'
Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll" Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64" Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"
meson test -C build mpv: meson test -C build mpv: