From 13b314bf907bf4d7f76f93254dc2d5bea94dbccb Mon Sep 17 00:00:00 2001 From: Ignacio Burgueño Date: Tue, 14 Apr 2015 22:24:23 -0300 Subject: Adds travis integration --- .travis.yml | 27 +++++++++++ .travis/platform.sh | 15 +++++++ .travis/setenv_lua.sh | 3 ++ .travis/setup_lua.sh | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 167 insertions(+) create mode 100644 .travis.yml create mode 100644 .travis/platform.sh create mode 100644 .travis/setenv_lua.sh create mode 100644 .travis/setup_lua.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..754db70 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,27 @@ +language: c + +sudo: false + +env: + global: + - LUAROCKS=2.2.1 + matrix: + - LUA=lua5.1 + - LUA=lua5.2 + - LUA=lua5.3 + - LUA=luajit # latest stable version (2.0.3) + - LUA=luajit2.0 # current head of 2.0 branch + - LUA=luajit2.1 # current head of 2.1 branch + +before_install: + - source .travis/setenv_lua.sh + +script: + - lua valua-test.lua + +after_success: + +notifications: + email: + on_success: change + on_failure: always diff --git a/.travis/platform.sh b/.travis/platform.sh new file mode 100644 index 0000000..7259a7d --- /dev/null +++ b/.travis/platform.sh @@ -0,0 +1,15 @@ +if [ -z "${PLATFORM:-}" ]; then + PLATFORM=$TRAVIS_OS_NAME; +fi + +if [ "$PLATFORM" == "osx" ]; then + PLATFORM="macosx"; +fi + +if [ -z "$PLATFORM" ]; then + if [ "$(uname)" == "Linux" ]; then + PLATFORM="linux"; + else + PLATFORM="macosx"; + fi; +fi diff --git a/.travis/setenv_lua.sh b/.travis/setenv_lua.sh new file mode 100644 index 0000000..8d8c825 --- /dev/null +++ b/.travis/setenv_lua.sh @@ -0,0 +1,3 @@ +export PATH=${PATH}:$HOME/.lua:$HOME/.local/bin:${TRAVIS_BUILD_DIR}/install/luarocks/bin +bash .travis/setup_lua.sh +eval `$HOME/.lua/luarocks path` diff --git a/.travis/setup_lua.sh b/.travis/setup_lua.sh new file mode 100644 index 0000000..5908085 --- /dev/null +++ b/.travis/setup_lua.sh @@ -0,0 +1,122 @@ +#! /bin/bash + +# A script for setting up environment for travis-ci testing. +# Sets up Lua and Luarocks. +# LUA must be "lua5.1", "lua5.2" or "luajit". +# luajit2.0 - master v2.0 +# luajit2.1 - master v2.1 + +set -eufo pipefail + +LUAJIT_BASE="LuaJIT-2.0.3" + +source .travis/platform.sh + +LUA_HOME_DIR=$TRAVIS_BUILD_DIR/install/lua + +LR_HOME_DIR=$TRAVIS_BUILD_DIR/install/luarocks + +mkdir $HOME/.lua + +LUAJIT="no" + +if [ "$PLATFORM" == "macosx" ]; then + if [ "$LUA" == "luajit" ]; then + LUAJIT="yes"; + fi + if [ "$LUA" == "luajit2.0" ]; then + LUAJIT="yes"; + fi + if [ "$LUA" == "luajit2.1" ]; then + LUAJIT="yes"; + fi; +elif [ "$(expr substr $LUA 1 6)" == "luajit" ]; then + LUAJIT="yes"; +fi + +mkdir -p "$LUA_HOME_DIR" + +if [ "$LUAJIT" == "yes" ]; then + + if [ "$LUA" == "luajit" ]; then + curl http://luajit.org/download/$LUAJIT_BASE.tar.gz | tar xz; + else + git clone http://luajit.org/git/luajit-2.0.git $LUAJIT_BASE; + fi + + cd $LUAJIT_BASE + + if [ "$LUA" == "luajit2.1" ]; then + git checkout v2.1; + fi + + make && make install PREFIX="$LUA_HOME_DIR" + + if [ "$LUA" == "luajit2.1" ]; then + ln -s $LUA_HOME_DIR/bin/luajit-2.1.0-alpha $HOME/.lua/luajit + ln -s $LUA_HOME_DIR/bin/luajit-2.1.0-alpha $HOME/.lua/lua; + else + ln -s $LUA_HOME_DIR/bin/luajit $HOME/.lua/luajit + ln -s $LUA_HOME_DIR/bin/luajit $HOME/.lua/lua; + fi; + +else + + if [ "$LUA" == "lua5.1" ]; then + curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz + cd lua-5.1.5; + elif [ "$LUA" == "lua5.2" ]; then + curl http://www.lua.org/ftp/lua-5.2.4.tar.gz | tar xz + cd lua-5.2.4; + elif [ "$LUA" == "lua5.3" ]; then + curl http://www.lua.org/ftp/lua-5.3.0.tar.gz | tar xz + cd lua-5.3.0; + fi + + make $PLATFORM + make INSTALL_TOP="$LUA_HOME_DIR" install; + + ln -s $LUA_HOME_DIR/bin/lua $HOME/.lua/lua + ln -s $LUA_HOME_DIR/bin/luac $HOME/.lua/luac; + +fi + +cd $TRAVIS_BUILD_DIR + +lua -v + +LUAROCKS_BASE=luarocks-$LUAROCKS + +curl --location http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz + +cd $LUAROCKS_BASE + +if [ "$LUA" == "luajit" ]; then + ./configure --lua-suffix=jit --with-lua-include="$LUA_HOME_DIR/include/luajit-2.0" --prefix="$LR_HOME_DIR"; +elif [ "$LUA" == "luajit2.0" ]; then + ./configure --lua-suffix=jit --with-lua-include="$LUA_HOME_DIR/include/luajit-2.0" --prefix="$LR_HOME_DIR"; +elif [ "$LUA" == "luajit2.1" ]; then + ./configure --lua-suffix=jit --with-lua-include="$LUA_HOME_DIR/include/luajit-2.1" --prefix="$LR_HOME_DIR"; +else + ./configure --with-lua="$LUA_HOME_DIR" --prefix="$LR_HOME_DIR" +fi + +make build && make install + +ln -s $LR_HOME_DIR/bin/luarocks $HOME/.lua/luarocks + +cd $TRAVIS_BUILD_DIR + +luarocks --version + +rm -rf $LUAROCKS_BASE + +if [ "$LUAJIT" == "yes" ]; then + rm -rf $LUAJIT_BASE; +elif [ "$LUA" == "lua5.1" ]; then + rm -rf lua-5.1.5; +elif [ "$LUA" == "lua5.2" ]; then + rm -rf lua-5.2.4; +elif [ "$LUA" == "lua5.3" ]; then + rm -rf lua-5.3.0; +fi -- cgit v1.2.3-54-g00ecf From dc6ab555607f3380f4921b7a2f665a873aebd656 Mon Sep 17 00:00:00 2001 From: Ignacio Burgueño Date: Tue, 14 Apr 2015 22:29:36 -0300 Subject: Bump rockspec since Lua 5.3 is supported --- valua-0.2.1-2.rockspec | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 valua-0.2.1-2.rockspec diff --git a/valua-0.2.1-2.rockspec b/valua-0.2.1-2.rockspec new file mode 100644 index 0000000..8584880 --- /dev/null +++ b/valua-0.2.1-2.rockspec @@ -0,0 +1,23 @@ +package = "Valua" +version = "0.2.1-1" +source = { + url = "git://github.com/Etiene/valua", + tag = "v0.2.1" +} +description = { + summary = "Validation for Lua!", + detailed = [[ + This module provides tools for validating values, very useful in forms, but also usable elsewhere. It works in appended chains. Create a new validation object and start chaining your test functions. + ]], + homepage = "https://github.com/Etiene/valua", + license = "MIT" +} +dependencies = { + "lua >= 5.1, < 5.4" +} +build = { + type = "builtin", + modules = { + ["valua"] = "valua.lua", + } +} \ No newline at end of file -- cgit v1.2.3-54-g00ecf From fae07a450ea0b1e9998c4443c147d4c9e8bd4ef7 Mon Sep 17 00:00:00 2001 From: Ignacio Burgueño Date: Tue, 14 Apr 2015 22:32:26 -0300 Subject: Adds travis-ci to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 01cc083..b3903c0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ ##Valua - Validation for Lua +[![Build Status](https://travis-ci.org/Etiene/valua.svg?branch=master)](https://travis-ci.org/Etiene/valua) + A module for making chained validations. Create your objects, append your tests, use and reuse it! Originally bundled with Sailor MVC Web Framework, now released as a separated module. -- cgit v1.2.3-54-g00ecf