Hopefully fix x86 CI builds.

This commit is contained in:
Ian Walton 2020-08-22 23:39:18 -04:00
parent 3ebf5a0d00
commit f5fd72a81d
2 changed files with 13 additions and 1 deletions

View File

@ -63,9 +63,21 @@ steps:
displayName: Main Build
- bash: ./artifacts.sh standard
displayName: Main Artifact Rename
- task: UsePythonVersion@0
inputs:
versionSpec: '3.7'
architecture: 'x86'
- script: pip install .[all] pywebview[cef]==3.3.3
displayName: PIP Dependencies x86
- bash: SKIP_CYTHON=1 pip install git+https://github.com/samuelcolvin/pydantic.git@v0.32
displayName: Pydantic w/o CYTHON x86
- bash: cd pyinstaller/bootloader; python ./waf distclean all; cd ..; python setup.py install
displayName: PyInstaller Bootloader x86
- script: build-win-32.bat
displayName: Legacy Build
- bash: ./artifacts.sh legacy
displayName: Legacy Artifact Rename
- publish: publish
artifact: WindowsBuild

View File

@ -8,7 +8,7 @@ rem The desktop version (and corresponding shim shortcut) do work, however.
rem Edge-based build
rem "C:\Program Files (x86)\Python37-32\Scripts\pyinstaller" -w --add-binary "mpv32\mpv-1.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\webclient_view\webclient;jellyfin_mpv_shim\webclient_view\webclient" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --add-binary "Microsoft.Toolkit.Forms.UI.Controls.WebView.dll;." --icon jellyfin.ico run-desktop-edge.py
rem CEF-based build
"C:\Program Files (x86)\Python37-32\Scripts\pyinstaller" -w --add-binary "mpv32\mpv-1.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\default_shader_pack;jellyfin_mpv_shim\default_shader_pack" --add-data "jellyfin_mpv_shim\messages;jellyfin_mpv_shim\messages" --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\webclient_view\webclient;jellyfin_mpv_shim\webclient_view\webclient" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --icon jellyfin.ico run-desktop.py
pyinstaller -w --add-binary "mpv32\mpv-1.dll;." --add-data "jellyfin_mpv_shim\mouse.lua;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\default_shader_pack;jellyfin_mpv_shim\default_shader_pack" --add-data "jellyfin_mpv_shim\messages;jellyfin_mpv_shim\messages" --add-data "jellyfin_mpv_shim\systray.png;jellyfin_mpv_shim" --add-data "jellyfin_mpv_shim\webclient_view\webclient;jellyfin_mpv_shim\webclient_view\webclient" --add-data "jellyfin_mpv_shim\display_mirror\index.html;jellyfin_mpv_shim\display_mirror" --add-data "jellyfin_mpv_shim\display_mirror\jellyfin.css;jellyfin_mpv_shim\display_mirror" --icon jellyfin.ico run-desktop.py
if %errorlevel% neq 0 exit /b %errorlevel%
xcopy /E /Y cef32\cefpython3 dist\run-desktop\
xcopy /E /Y mpv32\mpv-1.dll dist\run-desktop\