|
@@ -439,12 +439,15 @@ class RunCi {
|
|
static function getLuaDependencies(jit = false, lua_version = "lua5.2", luarocks_version = "2.3.0") {
|
|
static function getLuaDependencies(jit = false, lua_version = "lua5.2", luarocks_version = "2.3.0") {
|
|
var home_dir = Sys.getEnv("HOME");
|
|
var home_dir = Sys.getEnv("HOME");
|
|
// the lua paths created by the setup script.
|
|
// the lua paths created by the setup script.
|
|
- addToPATH('$home_dir/.lua');
|
|
|
|
- addToPATH('$home_dir/.local/bin');
|
|
|
|
|
|
+ addToPATH('$home_dir/.lua');
|
|
|
|
+ addToPATH('$home_dir/.local/bin');
|
|
|
|
|
|
var build_dir = Sys.getEnv("TRAVIS_BUILD_DIR");
|
|
var build_dir = Sys.getEnv("TRAVIS_BUILD_DIR");
|
|
changeDirectory(build_dir);
|
|
changeDirectory(build_dir);
|
|
- addToPATH('$build_dir/install/luarocks/bin');
|
|
|
|
|
|
+ addToPATH('$build_dir/install/luarocks/bin');
|
|
|
|
+
|
|
|
|
+ var luarocks_path_additions = commandResult("luarocks", ["path"]);
|
|
|
|
+ addToPATH(luarocks_path_additions.stdout.trim());
|
|
|
|
|
|
if (jit) Sys.putEnv("LUAJIT","yes");
|
|
if (jit) Sys.putEnv("LUAJIT","yes");
|
|
Sys.putEnv("LUAROCKS", luarocks_version);
|
|
Sys.putEnv("LUAROCKS", luarocks_version);
|
|
@@ -459,7 +462,6 @@ class RunCi {
|
|
runCommand("pip", ["install", "--user", "cpp-coveralls"]);
|
|
runCommand("pip", ["install", "--user", "cpp-coveralls"]);
|
|
runCommand("luarocks", ["install", "lrexlib-pcre", "2.7.2-1", "--server=https://luarocks.org/dev"]);
|
|
runCommand("luarocks", ["install", "lrexlib-pcre", "2.7.2-1", "--server=https://luarocks.org/dev"]);
|
|
runCommand("luarocks", ["install", "luautf8", "--server=https://luarocks.org/dev"]);
|
|
runCommand("luarocks", ["install", "luautf8", "--server=https://luarocks.org/dev"]);
|
|
- runCommand("ls", ["-l", "/usr/local/lib/lua/5.2"]);
|
|
|
|
changeDirectory(unitDir);
|
|
changeDirectory(unitDir);
|
|
}
|
|
}
|
|
|
|
|