History

ci/win32: remove Strawberry Perl from path

It provides broken tools like diff, patch. Also fix PATH in test stage

Kacper Michajłow committed 2 years ago

Commit 281c66a1 parent 541e00f1 file · +4 −1Browse files

Unified · Split

.github/workflows/build.yml+4−1
@@ -118,7 +118,8 @@ jobs: · 117 unmodified lines
118 - name: Build118 - name: Build
119 id: build119 id: build
120 run: |120 run: |
121 $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' }) -join ';'121 $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' -and `
122 $_ -ne 'C:\Strawberry\c\bin' }) -join ';'
122 Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"123 Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
123 Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"124 Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"
124 ./ci/build-win32.ps1125 ./ci/build-win32.ps1
@@ -131,6 +132,8 @@ jobs: · 6 unmodified lines
131 - name: Run meson tests132 - name: Run meson tests
132 id: tests133 id: tests
133 run: |134 run: |
135 $env:PATH = ($env:PATH -split ';' | Where-Object { $_ -ne 'C:\Program Files\LLVM\bin' -and `
136 $_ -ne 'C:\Strawberry\c\bin' }) -join ';'
134 Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"137 Import-Module "$env:VS\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
135 Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"138 Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64"
136 meson test -C build mpv:139 meson test -C build mpv:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t