From bcfb90880faae0967d8ec01bca39dad5b7b82e2e Mon Sep 17 00:00:00 2001
From: mpeterv <mpeterval@gmail.com>
Date: Thu, 24 Sep 2015 17:58:36 +0300
Subject: [PATCH] Update travis config

---
 .travis.yml            | 21 +++++++++++++--------
 .travis_setup.sh       | 36 ------------------------------------
 .travis_setup_rocks.sh | 15 ---------------
 3 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 .travis_setup.sh
 delete mode 100644 .travis_setup_rocks.sh

diff --git a/.travis.yml b/.travis.yml
index 5271cba..1b18570 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,22 @@
-language: c
+language: python
+sudo: false
 
 env:
-  - LUA="Lua 5.1"
-  - LUA="Lua 5.2"
-  - LUA="Lua 5.3"
-  - LUA="LuaJIT 2.0"
+  - LUA="lua 5.1"
+  - LUA="lua 5.2"
+  - LUA="lua 5.3"
+  - LUA="luajit 2.0"
 
 before_install:
-  - bash .travis_setup.sh
-  - bash .travis_setup_rocks.sh
+  - pip install hererocks
+  - hererocks lua -r^ --$LUA
+  - export PATH=$PATH:$PWD/lua/bin
+  - luarocks install luacheck
+  - luarocks install dkjson --deps-mode=none
+  - luarocks install busted
 
 install:
-  - sudo luarocks make
+  - luarocks make
 
 script:
   - busted
diff --git a/.travis_setup.sh b/.travis_setup.sh
deleted file mode 100644
index 28d9276..0000000
--- a/.travis_setup.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-# A script for setting up environment for travis-ci testing.
-# Sets up Lua and Luarocks.
-# LUA must be "Lua 5.1", "Lua 5.2", "Lua 5.3" or "LuaJIT 2.0".
-
-set -e
-
-if [ "$LUA" == "LuaJIT 2.0" ]; then
-  wget -O - http://luajit.org/download/LuaJIT-2.0.4.tar.gz | tar xz
-  cd LuaJIT-2.0.4
-  make && sudo make install INSTALL_TSYMNAME=lua;
-else
-  if [ "$LUA" == "Lua 5.1" ]; then
-    wget -O - http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
-    cd lua-5.1.5;
-  elif [ "$LUA" == "Lua 5.2" ]; then
-    wget -O - http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz
-    cd lua-5.2.4;
-  elif [ "$LUA" == "Lua 5.3" ]; then
-    wget -O - http://www.lua.org/ftp/lua-5.3.0.tar.gz | tar xz
-    cd lua-5.3.0;
-  fi
-  sudo make linux install;
-fi
-
-cd ..
-wget -O - http://luarocks.org/releases/luarocks-2.2.2.tar.gz | tar xz
-cd luarocks-2.2.2;
-
-if [ "$LUA" == "LuaJIT 2.0" ]; then
-  ./configure --with-lua-include=/usr/local/include/luajit-2.0;
-else
-  ./configure;
-fi
-
-make && sudo make install
-cd ..
diff --git a/.travis_setup_rocks.sh b/.travis_setup_rocks.sh
deleted file mode 100644
index b221128..0000000
--- a/.travis_setup_rocks.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# A script for setting up Lua rocks for travis-ci testing.
-
-sudo luarocks install dkjson --deps-mode=none
-
-mkdir busted
-wget -O - https://api.github.com/repos/Olivine-Labs/busted/tarball/master | tar xz -C busted --strip-components=1
-cd busted
-sudo luarocks make busted-scm-0.rockspec
-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 ..