diff options
author | roboo <robo.karasek@gmail.com> | 2016-08-21 22:23:09 +0200 |
---|---|---|
committer | roboo <robo.karasek@gmail.com> | 2016-08-21 22:23:09 +0200 |
commit | 3dd43e885f1d273bd3b51f4f9e7e7d20a1beb146 (patch) | |
tree | ab969297dc1d6fdded5c19b53343382b1dde6edf | |
parent | c22227e0e0bdf27e273d9faee7955686ceb4724c (diff) | |
download | luarocks-3dd43e885f1d273bd3b51f4f9e7e7d20a1beb146.tar.gz luarocks-3dd43e885f1d273bd3b51f4f9e7e7d20a1beb146.tar.bz2 luarocks-3dd43e885f1d273bd3b51f4f9e7e7d20a1beb146.zip |
Update of YAML files, changed coveralls for codecov
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | appveyor.yml | 34 |
2 files changed, 22 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 02bdb6c9..4962f290 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -55,8 +55,8 @@ script: | |||
55 | - busted -Xhelper travis,env=full --verbose | 55 | - busted -Xhelper travis,env=full --verbose |
56 | 56 | ||
57 | after_success: | 57 | after_success: |
58 | - luacov-coveralls -c $TRAVIS_BUILD_DIR/test/luacov.config --exclude $TRAVIS_BUILD_DIR/test/ | ||
59 | - luacov -c $TRAVIS_BUILD_DIR/test/luacov.config | 58 | - luacov -c $TRAVIS_BUILD_DIR/test/luacov.config |
59 | - cd $TRAVIS_BUILD_DIR/test/ && bash <(curl -s https://codecov.io/bash) | ||
60 | - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out | 60 | - grep "Summary" -B1 -A1000 $TRAVIS_BUILD_DIR/test/luacov.report.out |
61 | 61 | ||
62 | notifications: | 62 | notifications: |
diff --git a/appveyor.yml b/appveyor.yml index d7fc7cc2..66a12896 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -3,28 +3,36 @@ version: 2.2.1.{build}-test | |||
3 | shallow_clone: true | 3 | shallow_clone: true |
4 | 4 | ||
5 | environment: | 5 | environment: |
6 | LUAROCKS_VER: 2.2.1 | 6 | LUAROCKS_VER: 2.3.0 |
7 | 7 | ||
8 | matrix: | 8 | matrix: |
9 | - LUA_VER: 5.1.5 | 9 | - LUA: "lua 5.1" |
10 | - LUA_VER: 5.2.4 | 10 | - LUA: "lua 5.2" |
11 | - LUA_VER: 5.3.1 | 11 | - LUA: "lua 5.3" |
12 | - LJ_VER: 2.0.4 | 12 | - LUA: "luajit 2.0" |
13 | - LJ_VER: 2.1 | 13 | - LUA: "luajit 2.1" |
14 | |||
14 | 15 | ||
15 | init: | 16 | init: |
16 | # Setup Lua development/build environment | 17 | # Setup Lua development/build environment |
17 | # Make VS 2015 command line tools available | 18 | # Make VS 2015 command line tools available |
18 | - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform% | 19 | - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %platform% |
19 | 20 | ||
20 | install: | 21 | before_build: |
21 | # Setup Lua development/build environment | 22 | - set PATH=C:\Python27\Scripts;%PATH% # Add directory containing 'pip' to PATH |
22 | - call .appveyor\install.bat | 23 | - pip install hererocks |
24 | - hererocks env --%LUA% -rlatest | ||
25 | - call env\bin\activate | ||
23 | 26 | ||
24 | build_script: | 27 | build_script: |
25 | - call .appveyor\build.bat | 28 | - luarocks install busted 1> NUL 2> NUL |
26 | 29 | ||
27 | test_script: | 30 | test_script: |
28 | - echo "Testing..." | 31 | - busted --lpath=.//?.lua --exclude-tags=ssh,unix,mock -Xhelper appveyor |
29 | - cd test | 32 | |
30 | - call testing.bat | 33 | after_test: |
34 | - if "%LUA%"=="lua 5.1" (luarocks show bit32 || luarocks install bit32) | ||
35 | - luarocks install luacov | ||
36 | - pip install codecov | ||
37 | - luacov -c test/luacov.config | ||
38 | - cd test && codecov \ No newline at end of file | ||