Update travis config

Bump setup scripts, use luacheck.
This commit is contained in:
mpeterv
2015-06-09 21:57:02 +03:00
parent ff9abac990
commit 4320f40844
4 changed files with 17 additions and 14 deletions

2
.luacheckrc Normal file
View File

@@ -0,0 +1,2 @@
std = "min"
files["spec/"].std = "+busted"

View File

@@ -14,4 +14,5 @@ install:
- sudo luarocks make - sudo luarocks make
script: script:
- busted spec - busted
- luacheck src spec

View File

@@ -5,8 +5,8 @@
set -e set -e
if [ "$LUA" == "LuaJIT 2.0" ]; then if [ "$LUA" == "LuaJIT 2.0" ]; then
wget -O - http://luajit.org/download/LuaJIT-2.0.3.tar.gz | tar xz wget -O - http://luajit.org/download/LuaJIT-2.0.4.tar.gz | tar xz
cd LuaJIT-2.0.3 cd LuaJIT-2.0.4
make && sudo make install INSTALL_TSYMNAME=lua; make && sudo make install INSTALL_TSYMNAME=lua;
else else
if [ "$LUA" == "Lua 5.1" ]; then if [ "$LUA" == "Lua 5.1" ]; then
@@ -23,15 +23,8 @@ else
fi fi
cd .. cd ..
wget -O - http://luarocks.org/releases/luarocks-2.2.2.tar.gz | tar xz
if [ "$LUA" == "Lua 5.3" ]; then cd luarocks-2.2.2;
git clone https://github.com/keplerproject/luarocks
cd luarocks
git checkout 0f1c93774669468c5165be2711325224388aed41;
else
wget -O - http://luarocks.org/releases/luarocks-2.2.0.tar.gz | tar xz
cd luarocks-2.2.0;
fi
if [ "$LUA" == "LuaJIT 2.0" ]; then if [ "$LUA" == "LuaJIT 2.0" ]; then
./configure --with-lua-include=/usr/local/include/luajit-2.0; ./configure --with-lua-include=/usr/local/include/luajit-2.0;

View File

@@ -1,8 +1,15 @@
# A script for setting up broken Lua rocks for travis-ci testing. # A script for setting up Lua rocks for travis-ci testing.
sudo luarocks install dkjson --deps-mode=none sudo luarocks install dkjson --deps-mode=none
git clone https://github.com/Olivine-Labs/busted mkdir busted
wget -O - https://api.github.com/repos/Olivine-Labs/busted/tarball/master | tar xz -C busted --strip-components=1
cd busted cd busted
sudo luarocks make busted-scm-0.rockspec sudo luarocks make busted-scm-0.rockspec
cd .. cd ..
mkdir luacheck
wget -O - https://api.github.com/repos/mpeterv/luacheck/tarball/master | tar xz -C luacheck --strip-components=1
cd luacheck
sudo luarocks make
cd ..