From 584891c39e3cd0ead08006ae4388af23191b2275 Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:16:29 -0600 Subject: [PATCH 1/9] Trying out linux build --- README.md | 5 +++-- appveyor.yml | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e60d3bfb..7d82b4ed 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,9 @@ If you don't already have it, first step is to download ffmpeg. ## Windows -View the [releases](https://github.com/cdgriffith/FastFlix/releases) for prebuilt Windows binaries. For legal reasons -the ffmpeg binary cannot bundled and must be [separately downloaded](https://ffmpeg.zeranoe.com/builds/). +View the [releases](https://github.com/cdgriffith/FastFlix/releases) for Windows binaries (Generated via Appveyor and also available there). + +For legal reasons the ffmpeg binary cannot bundled and must be [separately downloaded](https://ffmpeg.zeranoe.com/builds/). ## Linux diff --git a/appveyor.yml b/appveyor.yml index a522c60c..757978d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,16 +1,27 @@ version: 1.0.0-{build} -image: Visual Studio 2017 +image: +- Visual Studio 2017 +- Ubuntu1804 + platform: x64 +branches: + only: + - master + - build + install: - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed - cmd: C:\Python36-x64\python -m pip install -r requirements.txt + - sh: python3.6 -m pip install --upgrade pip setuptools --ignore-installed + - sh: python3.6 -m pip install -r requirements.txt build_script: - - cmd: build.bat + - cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile + - sh: pyinstaller --add-data "data\icon.ico;data" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile test: off artifacts: - - path: dist\* \ No newline at end of file + - path: dist\* From e12d2a97083173fea3adf64009fc01d15a7daa89 Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:21:17 -0600 Subject: [PATCH 2/9] pip and ubuntu don't play nice --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 757978d0..8ab2b78e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,7 @@ branches: install: - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed - cmd: C:\Python36-x64\python -m pip install -r requirements.txt + - sh: apt install python3-pip - sh: python3.6 -m pip install --upgrade pip setuptools --ignore-installed - sh: python3.6 -m pip install -r requirements.txt From b481fc28bdfd5ec36e706d27d047d879bd4749ed Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:23:52 -0600 Subject: [PATCH 3/9] Need some sweet sudo --- appveyor.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8ab2b78e..67130162 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,8 @@ version: 1.0.0-{build} image: -- Visual Studio 2017 -- Ubuntu1804 + - Ubuntu1804 + - Visual Studio 2017 platform: x64 @@ -14,9 +14,9 @@ branches: install: - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed - cmd: C:\Python36-x64\python -m pip install -r requirements.txt - - sh: apt install python3-pip - - sh: python3.6 -m pip install --upgrade pip setuptools --ignore-installed - - sh: python3.6 -m pip install -r requirements.txt + - sh: sudo apt install python3-pip + - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed + - sh: sudo python3.6 -m pip install -r requirements.txt build_script: - cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile From 05d186794e7fb3a1bb1cbb5ffe5aced0553f3076 Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:24:34 -0600 Subject: [PATCH 4/9] yes please let me in apt --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 67130162..1dddb3d8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ branches: install: - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed - cmd: C:\Python36-x64\python -m pip install -r requirements.txt - - sh: sudo apt install python3-pip + - sh: sudo apt install python3-pip -y - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed - sh: sudo python3.6 -m pip install -r requirements.txt From 968daa366753b021bd5661610e0f14cd941d1cf5 Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:26:20 -0600 Subject: [PATCH 5/9] caching bad for build server --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 1dddb3d8..3728a6ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,8 @@ install: - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed - cmd: C:\Python36-x64\python -m pip install -r requirements.txt - sh: sudo apt install python3-pip -y - - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed - - sh: sudo python3.6 -m pip install -r requirements.txt + # - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed --no-cache-dir + - sh: sudo python3.6 -m pip install -r requirements.txt --no-cache-dir build_script: - cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile From ffbdcb8b356dcf25aaf4c25a7e5d26a91acf3558 Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:27:37 -0600 Subject: [PATCH 6/9] windows vs linux fun --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3728a6ae..557356cf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,7 +20,7 @@ install: build_script: - cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile - - sh: pyinstaller --add-data "data\icon.ico;data" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile + - sh: pyinstaller --add-data "data/icon.ico;data" --noconsole flix/gui.py --icon data/icon.ico --name FastFlix --clean --onefile test: off From a83275bdf0c6c5360bdd08ab5b984d2ef409c70f Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:30:50 -0600 Subject: [PATCH 7/9] ubuntu is being a pain --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 557356cf..e097451a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,7 +16,8 @@ install: - cmd: C:\Python36-x64\python -m pip install -r requirements.txt - sh: sudo apt install python3-pip -y # - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed --no-cache-dir - - sh: sudo python3.6 -m pip install -r requirements.txt --no-cache-dir + - sh: sudo python3.6 -m pip install -r requirements.txt --no-cache-dir --progress-bar off + build_script: - cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile From 436658743f327aaa504643c274d3cf0fd3a741df Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:31:44 -0600 Subject: [PATCH 8/9] ubuntu is being a pain --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e097451a..5751397a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,7 +15,7 @@ install: - cmd: C:\Python36-x64\python -m pip install --upgrade pip setuptools --ignore-installed - cmd: C:\Python36-x64\python -m pip install -r requirements.txt - sh: sudo apt install python3-pip -y - # - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed --no-cache-dir + - sh: sudo python3.6 -m pip install --upgrade pip setuptools --ignore-installed --no-cache-dir - sh: sudo python3.6 -m pip install -r requirements.txt --no-cache-dir --progress-bar off From 88eddc823b51bbbbfc38834d28f58357aadea545 Mon Sep 17 00:00:00 2001 From: Chris Griffith Date: Tue, 19 Feb 2019 13:36:04 -0600 Subject: [PATCH 9/9] linux has to be different --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5751397a..dd823e4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,7 @@ install: build_script: - cmd: C:\Python36-x64\Scripts\pyinstaller --add-data "data\icon.ico;data" --paths "C:\Python36-x64\Lib\site-packages\shiboken2" --noconsole flix\gui.py --icon data\icon.ico --name FastFlix --clean --onefile - - sh: pyinstaller --add-data "data/icon.ico;data" --noconsole flix/gui.py --icon data/icon.ico --name FastFlix --clean --onefile + - sh: pyinstaller --add-data "data/icon.ico:data/" --noconsole flix/gui.py --icon data/icon.ico --name FastFlix --clean --onefile test: off