Skip to content

Commit 587922d

Browse files
committed
Update CI to test against 5.3.0 beta
5.3.0-work2 has been obsoleted by the newer 5.3.0-beta This testing infrastructure is taken from: https://github.com/moteus/lua-vararg/tree/246dc3126dd66935a020a0a26c165ceb035268e5/.travis
1 parent 9c85420 commit 587922d

File tree

3 files changed

+84
-18
lines changed

3 files changed

+84
-18
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ language: erlang
33
env:
44
global:
55
- PLATFORM=linux
6-
- LUAROCKS_VER=2.1.0
6+
- LUAROCKS_VER=2.2.0
77
matrix:
88
- LUA=lua5.1 LUA_SFX=
99
- LUA=lua5.2 LUA_SFX=
1010
- LUA=luajit LUA_SFX=jit
1111
- LUA=lua5.3 LUA_SFX=
1212

1313
before_install:
14-
- bash .travis/setup_lua.sh
14+
- bash -x .travis/setup_lua.sh
1515
- sudo pip install cpp-coveralls
1616

1717
install:

.travis/platform.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
if [ -z "$PLATFORM" ]; then
2+
PLATFORM=$TRAVIS_OS_NAME;
3+
fi
4+
5+
if [ "$PLATFORM" == "osx" ]; then
6+
PLATFORM="macosx";
7+
fi
8+
9+
if [ -z "$PLATFORM" ]; then
10+
if [ "$(uname)" == "Linux" ]; then
11+
PLATFORM="linux";
12+
else
13+
PLATFORM="macosx";
14+
fi;
15+
fi

.travis/setup_lua.sh

+67-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,54 @@
1+
#! /bin/bash
2+
13
# A script for setting up environment for travis-ci testing.
24
# Sets up Lua and Luarocks.
35
# LUA must be "lua5.1", "lua5.2" or "luajit".
4-
# PLATFORM must be "linux" or "macosx".
6+
# luajit2.0 - master v2.0
7+
# luajit2.1 - master v2.1
8+
9+
LUAJIT_BASE="LuaJIT-2.0.3"
10+
11+
source .travis/platform.sh
12+
13+
LUAJIT="no"
14+
15+
if [ "$PLATFORM" == "macosx" ]; then
16+
if [ "$LUA" == "luajit" ]; then
17+
LUAJIT="yes";
18+
fi
19+
if [ "$LUA" == "luajit2.0" ]; then
20+
LUAJIT="yes";
21+
fi
22+
if [ "$LUA" == "luajit2.1" ]; then
23+
LUAJIT="yes";
24+
fi;
25+
elif [ "$(expr substr $LUA 1 6)" == "luajit" ]; then
26+
LUAJIT="yes";
27+
fi
28+
29+
if [ "$LUAJIT" == "yes" ]; then
30+
31+
if [ "$LUA" == "luajit" ]; then
32+
curl http://luajit.org/download/$LUAJIT_BASE.tar.gz | tar xz;
33+
else
34+
git clone http://luajit.org/git/luajit-2.0.git $LUAJIT_BASE;
35+
fi
36+
37+
cd $LUAJIT_BASE
38+
39+
if [ "$LUA" == "luajit2.1" ]; then
40+
git checkout v2.1;
41+
fi
542

6-
if [ "$LUA" == "luajit" ]; then
7-
curl http://luajit.org/download/LuaJIT-2.0.2.tar.gz | tar xz
8-
cd LuaJIT-2.0.2
943
make && sudo make install
10-
cd $TRAVIS_BUILD_DIR;
44+
45+
if [ "$LUA" == "luajit2.1" ]; then
46+
sudo ln -s /usr/local/bin/luajit-2.1.0-alpha /usr/local/bin/luajit
47+
sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
48+
else
49+
sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
50+
fi;
51+
1152
else
1253
if [ "$LUA" == "lua5.1" ]; then
1354
curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
@@ -16,35 +57,45 @@ else
1657
curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
1758
cd lua-5.2.3;
1859
elif [ "$LUA" == "lua5.3" ]; then
19-
curl http://www.lua.org/work/lua-5.3.0-work2.tar.gz | tar xz
20-
cd lua-5.3.0-work2;
60+
curl http://www.lua.org/work/lua-5.3.0-beta.tar.gz | tar xz
61+
cd lua-5.3.0-beta;
2162
fi
22-
sudo make $PLATFORM install
23-
cd $TRAVIS_BUILD_DIR;
63+
sudo make $PLATFORM install;
2464
fi
2565

26-
LUAROCKS_BASE=luarocks-$LUAROCKS_VER
27-
curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
28-
cd $LUAROCKS_BASE;
66+
cd $TRAVIS_BUILD_DIR;
67+
68+
LUAROCKS_BASE=luarocks-$LUAROCKS
69+
70+
# curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
71+
72+
git clone https://github.com/keplerproject/luarocks.git $LUAROCKS_BASE
73+
cd $LUAROCKS_BASE
74+
75+
git checkout v$LUAROCKS
2976

3077
if [ "$LUA" == "luajit" ]; then
3178
./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
79+
elif [ "$LUA" == "luajit2.0" ]; then
80+
./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
81+
elif [ "$LUA" == "luajit2.1" ]; then
82+
./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.1;
3283
else
3384
./configure;
3485
fi
3586

36-
make && sudo make install
87+
make build && sudo make install
3788

3889
cd $TRAVIS_BUILD_DIR
3990

4091
rm -rf $LUAROCKS_BASE
4192

42-
if [ "$LUA" == "luajit" ]; then
43-
rm -rf LuaJIT-2.0.2;
93+
if [ "$LUAJIT" == "yes" ]; then
94+
rm -rf $LUAJIT_BASE;
4495
elif [ "$LUA" == "lua5.1" ]; then
4596
rm -rf lua-5.1.5;
4697
elif [ "$LUA" == "lua5.2" ]; then
4798
rm -rf lua-5.2.3;
4899
elif [ "$LUA" == "lua5.3" ]; then
49-
rm -rf lua-5.3.0-work2;
100+
rm -rf lua-5.3.0-beta;
50101
fi

0 commit comments

Comments
 (0)