travis: use stages (#2249)

Signed-off-by: Ruslan Kuprieiev <[email protected]>

scripts/build_package.sh

@@ -3,9 +3,24 @@
 set -e
 
 if [ ! -d "dvc" ]; then
-	echo "Please run this script from repository root"
-	exit 1
+    echo "Please run this script from repository root"
+    exit 1
 fi
 
 python setup.py sdist
 python setup.py bdist_wheel --universal
+
+# Make sure we have a correct version
+if [[ -n "$TRAVIS_TAG" ]]; then
+    pip uninstall -y dvc
+    if ! [ -x "$(command -v dvc)" ]; then
+        echo "ERROR: dvc command still exists! Unable to verify dvc version."
+	exit 1
+    fi
+    pip install dist/dvc-*.whl
+    if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then
+        echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'"
+        exit 1
+    fi
+    pip uninstall -y dvc
+fi

scripts/build_windows.cmd

@@ -16,8 +16,9 @@ where choco
 if %errorlevel% neq 0 (echo Error: choco not found && goto :error)
 
 choco install InnoSetup
-
-if not exist "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" (echo Error: Couldn't find Inno Setup compiler. Please go to jrsoftware.org/isinfo.php and install Inno Setup 5 && goto :error)
+refreshenv
+where iscc
+if %errorlevel% neq 0 (echo Error: Couldn't find Inno Setup compiler. && goto :error)
 
 echo ====== Installing requirements... ======
 call pip install .[all] || goto :error

scripts/ci/before_deploy.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -x
-set -e
-
-./scripts/build_package.sh
-
-if [[ -n "$TRAVIS_TAG" ]]; then
-    # Test version
-    pip uninstall -y dvc
-    pip install dist/dvc-*.whl
-    if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then
-        echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'"
-        exit 1
-    fi
-    pip uninstall -y dvc
-fi
-
-PY_VER=$(python -c 'import sys; print(sys.version_info[0:2])')
-if [[ "$PY_VER" != '(3, 7)' ]]; then
-    echo "Skipping building binary package because of a wrong python version."
-    exit 0
-fi
-
-if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_OSX_IMAGE" != "xcode7.3" ]]; then
-    echo "Skipping building binary package because of a wrong xcode version."
-    exit 0
-fi
-
-if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-    ./scripts/build_windows.cmd
-else
-    ./scripts/build_posix.sh
-fi