From fbc776dbfc8b6c5f596751d80fc8dff132d276f4 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 22 May 2019 09:42:51 -0700 Subject: [PATCH] Clean up AppVeyor script a bit, and install 32-bit VLC for 32-bit Python --- scripts/appveyor.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/appveyor.yml b/scripts/appveyor.yml index 2634958e6..439e931d7 100644 --- a/scripts/appveyor.yml +++ b/scripts/appveyor.yml @@ -12,7 +12,9 @@ clone_script: environment: matrix: - PYTHON: C:\\Python37-x64 + CHOCO_VLC: vlc - PYTHON: C:\\Python37 + CHOCO_VLC: vlc --forcex86 install: # Install dependencies from pypi @@ -31,13 +33,6 @@ after_test: # This is where we create a package using PyInstaller # Install PyInstaller - "%PYTHON%\\python.exe -m pip install pyinstaller" - # Download and install Inno Setup - used for packaging - # - appveyor DownloadFile http://www.jrsoftware.org/download.php/is-unicode.exe - # - is-unicode.exe /VERYSILENT /SUPPRESSMSGBOXES /SP- - # Download and unpack portable-bundle - - appveyor DownloadFile https://get.openlp.org/win-sdk/portable-setup.7z - - 7z x portable-setup.7z - - choco install vlc # Disabled portable installers - can't figure out how to make them silent # - curl -L -O http://downloads.sourceforge.net/project/portableapps/PortableApps.com%20Installer/PortableApps.comInstaller_3.4.4.paf.exe # - PortableApps.comInstaller_3.4.4.paf.exe /S @@ -45,6 +40,11 @@ after_test: # - PortableApps.comLauncher_2.2.1.paf.exe /S # - curl -L -O http://downloads.sourceforge.net/project/portableapps/NSIS%20Portable/NSISPortable_3.0_English.paf.exe # - NSISPortable_3.0_English.paf.exe /S + # Download and unpack portable-bundle + - appveyor DownloadFile https://get.openlp.org/win-sdk/portable-setup.7z + - 7z x portable-setup.7z + # Install VLC + - choco install %CHOCO_VLC% # Get the packaging code #- appveyor DownloadFile http://bazaar.launchpad.net/~openlp-core/openlp/packaging/tarball -FileName packaging.tar.gz - appveyor DownloadFile http://bazaar.launchpad.net/~raoul-snyman/openlp/wix-packaging/tarball -FileName packaging.tar.gz