Skip to content

Commit a0a0cac

Browse files
committed
Use hererocks on Travis.
1 parent a038558 commit a0a0cac

File tree

5 files changed

+30
-156
lines changed

5 files changed

+30
-156
lines changed

.travis.yml

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,45 @@ language: c
22

33
sudo: false
44

5-
env:
6-
global:
7-
- LUAROCKS=2.2.2
8-
matrix:
9-
- LUA=lua5.1
10-
- LUA=lua5.2
11-
- LUA=lua5.3
12-
- LUA=luajit
5+
matrix:
6+
include:
7+
- compiler: ": Lua51"
8+
env: LUA="lua 5.1"
9+
- compiler: ": Lua52"
10+
env: LUA="lua 5.2"
11+
- compiler: ": Lua53"
12+
env: LUA="lua 5.3"
13+
- compiler: ": LuaJIT20"
14+
env: LUA="luajit 2.0"
15+
- compiler: ": LuaJIT21"
16+
env: LUA="luajit 2.1"
17+
18+
cache:
19+
directories:
20+
- here
21+
- $HOME/.cache/pip
1322

1423
branches:
1524
only:
1625
- master
1726

1827
before_install:
19-
- source .travis/setenv_lua.sh
28+
- export CC=gcc
2029
- pip install --user cpp-coveralls
21-
- luarocks install luafilesystem --from=https://rocks.moonscript.org/dev
22-
- luarocks install luacov-coveralls
23-
- luarocks install lunitx
24-
- luarocks install dkjson --deps-mode=none
30+
- pip install --user hererocks
31+
- hererocks here -r^ --$LUA
32+
- export PATH=$PATH:$PWD/here/bin
2533

2634
install:
2735
- luarocks make rockspecs/lua-curl-scm-0.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage"
2836

29-
script:
37+
before_script:
38+
- luarocks show luacov-coveralls || luarocks install luacov-coveralls
39+
- luarocks show lunitx || luarocks install lunitx
40+
- luarocks show luafilesystem || luarocks install luafilesystem
41+
- luarocks show dkjson || luarocks install dkjson --deps-mode=none
42+
43+
script:
3044
- cd test
3145
- lua -e "print(require 'cURL.utils'.find_ca_bundle())"
3246
- lunit.sh test_easy.lua
@@ -37,7 +51,7 @@ script:
3751

3852
after_success:
3953
- coveralls -b .. -r .. --dump c.report.json
40-
- luacov-coveralls -j c.report.json
54+
- luacov-coveralls -j c.report.json -v
4155

4256
notifications:
4357
email:

.travis/platform.sh

Lines changed: 0 additions & 15 deletions
This file was deleted.

.travis/setenv_lua.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

.travis/setup_lua.sh

Lines changed: 0 additions & 122 deletions
This file was deleted.

test/.luacov

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ return {
3232
-- configuration for luacov-coveralls reporter
3333
coveralls = {
3434
pathcorrect = {
35-
{"/usr/local/share/lua/5.[123]", "src/lua"};
35+
{"^.-[/\\]share[/\\]lua[/\\]5.%d", "src/lua"};
3636
},
3737
},
3838
}

0 commit comments

Comments
 (0)