diff --git a/.travis.yml b/.travis.yml index 68b5d4899..f92a44859 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,14 +44,14 @@ install: - printf "[default]\naws_access_key_id = $AWS_ACCESS_KEY_ID\naws_secret_access_key = $AWS_SECRET_ACCESS_KEY\n" > ~/.aws/credentials - printf "[default]\n" > ~/.aws/config before_script: - - bash ./ci/before_script.sh + - bash ./scripts/ci/before_script.sh script: - ./unittests.sh - ./functests.sh - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./build_macos.sh; else ./build_linux.sh; fi - - ./build_package.sh + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./scripts/build_macos.sh; else ./scripts/build_linux.sh; fi + - ./scripts/build_package.sh after_script: - - bash ./ci/after_scripts.sh + - bash ./scripts/ci/after_scripts.sh deploy: condition: "[[ $(python -c 'import sys; print(sys.version_info[0])') == '2' ]]" provider: releases diff --git a/build_package.sh b/build_package.sh deleted file mode 100755 index 11662fbd8..000000000 --- a/build_package.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e - -python setup.py sdist -python setup.py bdist_wheel --universal diff --git a/build_linux.sh b/scripts/build_linux.sh similarity index 93% rename from build_linux.sh rename to scripts/build_linux.sh index 89c8a981d..f9f339d9c 100755 --- a/build_linux.sh +++ b/scripts/build_linux.sh @@ -11,6 +11,11 @@ print_error() echo -e "\e[31m$1\e[0m" } +if [ ! -d "dvc" ]; then + print_error "Please run this script from repository root" + exit 1 +fi + trap 'print_error "FAIL"; exit 1' ERR print_info() diff --git a/build_macos.sh b/scripts/build_macos.sh similarity index 92% rename from build_macos.sh rename to scripts/build_macos.sh index f0c09ead8..556e8968f 100755 --- a/build_macos.sh +++ b/scripts/build_macos.sh @@ -11,6 +11,11 @@ print_error() echo -e "\e[31m$1\e[0m" } +if [ ! -d "dvc" ]; then + print_error "Please run this script from repository root" + exit 1 +fi + trap 'print_error "FAIL"; exit 1' ERR print_info() diff --git a/scripts/build_package.sh b/scripts/build_package.sh new file mode 100755 index 000000000..429feef39 --- /dev/null +++ b/scripts/build_package.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +if [ ! -d "dvc" ]; then + echo "Please run this script from repository root" + exit 1 +fi + +python setup.py sdist +python setup.py bdist_wheel --universal diff --git a/build_windows.cmd b/scripts/build_windows.cmd similarity index 91% rename from build_windows.cmd rename to scripts/build_windows.cmd index 9aeafadea..dc17a0bee 100644 --- a/build_windows.cmd +++ b/scripts/build_windows.cmd @@ -2,6 +2,8 @@ echo ====== Starting to build dvc installer for Windows... ====== +if not exist dvc\NUL (echo Error: Please run this script from repository root && goto :error) + rmdir /Q /S build rmdir /Q /S dist del /Q /S dvc.spec diff --git a/ci/after_script.sh b/scripts/ci/after_script.sh similarity index 100% rename from ci/after_script.sh rename to scripts/ci/after_script.sh diff --git a/ci/before_script.sh b/scripts/ci/before_script.sh similarity index 100% rename from ci/before_script.sh rename to scripts/ci/before_script.sh