diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 550424e25fa76..0431a757f5925 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -147,41 +147,41 @@ jobs: meson wrap install libpng meson wrap install zlib - - name: Build - id: build - 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" - Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64" - ./ci/build-win32.ps1 - - - name: Print build log - if: ${{ failure() && steps.build.outcome == 'failure' }} - run: | - cat ./build/meson-logs/meson-log.txt - - - name: Run meson tests - id: tests - 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" - Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64" - meson test -C build mpv: - - - name: Print meson test log - if: ${{ failure() && steps.tests.outcome == 'failure' }} - run: | - cat ./build/meson-logs/testlog.txt - - - uses: actions/upload-artifact@v4 - with: - name: mpv-x86_64-windows-msvc - path: | - build/mpv.??? - build/vulkan-*.dll - !build/mpv.lib + # - name: Build + # id: build + # 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" + # Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64" + # ./ci/build-win32.ps1 + + # - name: Print build log + # if: ${{ failure() && steps.build.outcome == 'failure' }} + # run: | + # cat ./build/meson-logs/meson-log.txt + + # - name: Run meson tests + # id: tests + # 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" + # Enter-VsDevShell -VsInstallPath $env:VS -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64" + # meson test -C build mpv: + + # - name: Print meson test log + # if: ${{ failure() && steps.tests.outcome == 'failure' }} + # run: | + # cat ./build/meson-logs/testlog.txt + + # - uses: actions/upload-artifact@v4 + # with: + # name: mpv-x86_64-windows-msvc + # path: | + # build/mpv.??? + # build/vulkan-*.dll + # !build/mpv.lib - name: Remove old caches run: |