From 88ac29f0cfbe4064155c7a1f5ea706627bd08ef2 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Fri, 8 Jul 2016 12:04:08 +0300 Subject: .travis.yml: don't use virtualenv Install python 2 and avoid using virtualenv, pip on osx works fine without it. Also remove unnecessary path prefix and add newline at the end. --- .travis.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8755e7f..0ec4b0cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,7 @@ matrix: before_install: - - 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 virtualenv venv -p python3; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi - + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python; fi - pip install hererocks - hererocks lua_install -r^ --$LUA - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH @@ -60,10 +56,10 @@ script: after_success: - luacov-coveralls -c $TRAVIS_BUILD_DIR/test/luacov.config --exclude $TRAVIS_BUILD_DIR/test/ - - $PWD/lua_install/bin/luacov -c $TRAVIS_BUILD_DIR/test/luacov.config + - luacov -c $TRAVIS_BUILD_DIR/test/luacov.config - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out notifications: email: on_success: change - on_failure: change \ No newline at end of file + on_failure: change -- cgit v1.2.3-55-g6feb