aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Melnichenko <mpeterval@gmail.com>2016-07-08 12:04:08 +0300
committerPeter Melnichenko <mpeterval@gmail.com>2016-07-08 12:04:08 +0300
commit88ac29f0cfbe4064155c7a1f5ea706627bd08ef2 (patch)
treec10302389408e8211f79a17533cf19cd4f2b7bb3
parent5af7e0d7c2dcf65e41ae8523f3771e9528be32a7 (diff)
downloadluarocks-88ac29f0cfbe4064155c7a1f5ea706627bd08ef2.tar.gz
luarocks-88ac29f0cfbe4064155c7a1f5ea706627bd08ef2.tar.bz2
luarocks-88ac29f0cfbe4064155c7a1f5ea706627bd08ef2.zip
.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.
-rw-r--r--.travis.yml10
1 files 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:
40 40
41 41
42before_install: 42before_install:
43 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi 43 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python; fi
44 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
45 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then virtualenv venv -p python3; fi
46 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source venv/bin/activate; fi
47
48 - pip install hererocks 44 - pip install hererocks
49 - hererocks lua_install -r^ --$LUA 45 - hererocks lua_install -r^ --$LUA
50 - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH 46 - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH
@@ -60,10 +56,10 @@ script:
60 56
61after_success: 57after_success:
62 - luacov-coveralls -c $TRAVIS_BUILD_DIR/test/luacov.config --exclude $TRAVIS_BUILD_DIR/test/ 58 - luacov-coveralls -c $TRAVIS_BUILD_DIR/test/luacov.config --exclude $TRAVIS_BUILD_DIR/test/
63 - $PWD/lua_install/bin/luacov -c $TRAVIS_BUILD_DIR/test/luacov.config 59 - luacov -c $TRAVIS_BUILD_DIR/test/luacov.config
64 - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out 60 - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out
65 61
66notifications: 62notifications:
67 email: 63 email:
68 on_success: change 64 on_success: change
69 on_failure: change \ No newline at end of file 65 on_failure: change