From 9b417486a9760e34e1f90fefa818dd2ca145a80e Mon Sep 17 00:00:00 2001
From: Lex Berezhny <lex@damoti.com>
Date: Thu, 26 Jul 2018 19:18:48 -0400
Subject: [PATCH] altogether now!

---
 .travis.yml | 133 ++++++++++++++++++++++++++--------------------------
 1 file changed, 66 insertions(+), 67 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1ef499891..0486ad9ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,75 +7,74 @@ python:
 jobs:
   include:
 
-#    - stage: code quality
-#      name: "pylint lbrynet"
-#      install:
-#        - pip install pylint
-#        - pip install git+https://github.com/lbryio/torba.git
-#        - pip install git+https://github.com/lbryio/lbryschema.git
-#        - pip install -e .
-#      script: pylint lbrynet
-#
-#    - stage: test
-#      name: "Unit Tests"
-#      install:
-#        - pip install coverage
-#        - pip install git+https://github.com/lbryio/torba.git
-#        - pip install git+https://github.com/lbryio/lbryschema.git
-#        - pip install -e .[test]
-#      script: HOME=/tmp coverage run --source=lbrynet -m twisted.trial tests.unit
-#      #script: HOME=/tmp coverage run --source=lbrynet -m twisted.trial tests.functional tests.unit
-#      after_success:
-#        - bash <(curl -s https://codecov.io/bash)
-#
-#    - name: "Integration Tests"
-#      install:
-#        - pip install tox-travis coverage
-#        - pushd .. && git clone https://github.com/lbryio/electrumx.git --branch lbryumx && popd
-#        - pushd .. && git clone https://github.com/lbryio/orchstr8.git && popd
-#        - pushd .. && git clone https://github.com/lbryio/lbryschema.git && popd
-#        - pushd .. && git clone https://github.com/lbryio/lbryumx.git && popd
-#        - pushd .. && git clone https://github.com/lbryio/torba.git && popd
-#      script: tox
-#      after_success:
-#        - coverage combine tests/
-#        - bash <(curl -s https://codecov.io/bash)
-#
-#    - stage: build
-#      name: "Windows"
-#      services:
-#        - docker
-#      install:
-#        - docker pull cdrx/pyinstaller-windows:python3-32bit
-#      script:
-#        - docker run -v "$(pwd):/src/lbry" cdrx/pyinstaller-windows:python3-32bit lbry/scripts/wine_build.sh
-#      addons:
-#        artifacts:
-#          working_dir: dist
-#          paths:
-#            - lbry.exe
-#          target_paths:
-#            - /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/win
-#
-#    - name: "Linux"
-#      install:
-#        - pip install pyinstaller
-#        - pip install git+https://github.com/lbryio/torba.git
-#        - pip install git+https://github.com/lbryio/lbryschema.git
-#        - pip install -e .
-#      script:
-#        - pyinstaller -F -n lbry lbrynet/cli.py
-#        - ./dist/lbry --version
-#      addons:
-#        artifacts:
-#          working_dir: dist
-#          paths:
-#            - lbry
-#          target_paths:
-#            - /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/linux
+    - stage: code quality
+      name: "pylint lbrynet"
+      install:
+        - pip install pylint
+        - pip install git+https://github.com/lbryio/torba.git
+        - pip install git+https://github.com/lbryio/lbryschema.git
+        - pip install -e .
+      script: pylint lbrynet
+
+    - stage: test
+      name: "Unit Tests"
+      install:
+        - pip install coverage
+        - pip install git+https://github.com/lbryio/torba.git
+        - pip install git+https://github.com/lbryio/lbryschema.git
+        - pip install -e .[test]
+      script: HOME=/tmp coverage run --source=lbrynet -m twisted.trial tests.unit
+      #script: HOME=/tmp coverage run --source=lbrynet -m twisted.trial tests.functional tests.unit
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
+
+    - name: "Integration Tests"
+      install:
+        - pip install tox-travis coverage
+        - pushd .. && git clone https://github.com/lbryio/electrumx.git --branch lbryumx && popd
+        - pushd .. && git clone https://github.com/lbryio/orchstr8.git && popd
+        - pushd .. && git clone https://github.com/lbryio/lbryschema.git && popd
+        - pushd .. && git clone https://github.com/lbryio/lbryumx.git && popd
+        - pushd .. && git clone https://github.com/lbryio/torba.git && popd
+      script: tox
+      after_success:
+        - coverage combine tests/
+        - bash <(curl -s https://codecov.io/bash)
 
     - stage: build
-      name: "Mac"
+      name: "Windows"
+      services:
+        - docker
+      install:
+        - docker pull cdrx/pyinstaller-windows:python3-32bit
+      script:
+        - docker run -v "$(pwd):/src/lbry" cdrx/pyinstaller-windows:python3-32bit lbry/scripts/wine_build.sh
+      addons:
+        artifacts:
+          working_dir: dist
+          paths:
+            - lbry.exe
+          target_paths:
+            - /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/win
+
+    - name: "Linux"
+      install:
+        - pip install pyinstaller
+        - pip install git+https://github.com/lbryio/torba.git
+        - pip install git+https://github.com/lbryio/lbryschema.git
+        - pip install -e .
+      script:
+        - pyinstaller -F -n lbry lbrynet/cli.py
+        - ./dist/lbry --version
+      addons:
+        artifacts:
+          working_dir: dist
+          paths:
+            - lbry
+          target_paths:
+            - /daemon/build-${TRAVIS_BUILD_NUMBER}_commit-${TRAVIS_COMMIT:0:7}_branch-${TRAVIS_BRANCH}$([ ! -z ${TRAVIS_TAG} ] && echo _tag-${TRAVIS_TAG})/linux
+
+    - name: "Mac"
       os: osx
       osx_image: xcode9.4
       language: generic