about summary refs log tree commit diff
path: root/.travis.yml
diff options
context:
space:
mode:
authorPaweł Jastrzębski <pawelj@iosphe.re>2018-03-10 08:36:34 +0100
committerPaweł Jastrzębski <pawelj@iosphe.re>2018-03-10 08:41:12 +0100
commit968b083fb20fa06f118ad94d92fd39c124851eb8 (patch)
tree4161504c0ef5c977a0764281cc7102a51307597d /.travis.yml
parentMerge branch 'master' of https://github.com/ciromattia/kcc (diff)
downloadkcc-968b083fb20fa06f118ad94d92fd39c124851eb8.tar.gz
kcc-968b083fb20fa06f118ad94d92fd39c124851eb8.tar.bz2
kcc-968b083fb20fa06f118ad94d92fd39c124851eb8.zip
Updated build enviroment
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml29
1 files changed, 10 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index aacaa77..977b0df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +1,22 @@
 matrix:
   include:
-  - os: linux
-    language: python
-    python: 3.6
-    dist: trusty
-    sudo: required
   - os: osx
     language: generic
     osx_image: xcode6.4
 
 before_install:
-- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then sudo apt-get -y install ruby ruby-dev ; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install --upgrade pip setuptools wheel ; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/linux/sentry.py.enc -out kindlecomicconverter/sentry.py -d ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew install python3 ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then travis_wait 30 brew upgrade node ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install --upgrade pip setuptools wheel ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/osx/sentry.py.enc -out kindlecomicconverter/sentry.py -d ; fi
+- brew update
+- brew install python3
+- brew uninstall node
+- travis_wait 30 brew install node@6
+- brew link node@6 --force --overwrite
+- pip3 install --upgrade pip setuptools wheel
+- openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/osx/sentry.py.enc -out kindlecomicconverter/sentry.py -d
 
 install:
-- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install -r requirements.txt ; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install certifi PyInstaller ; fi
-- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then gem install fpm ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install -r requirements.txt ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install certifi PyInstaller ; fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then npm install -g appdmg ; fi
+- pip3 install -r requirements.txt
+- pip3 install certifi https://github.com/bjones1/pyinstaller/archive/pyqt5_fix.zip
+- npm install -g appdmg
 
 script: python3 setup.py build_binary