2
0
Эх сурвалжийг харах

Lua : try different travis env approach

Justin Donaldson 9 жил өмнө
parent
commit
2dd0026fd9

+ 1 - 1
.travis/setenv_lua.sh

@@ -1,3 +1,3 @@
 export PATH=${PATH}:$HOME/.lua:$HOME/.local/bin:${TRAVIS_BUILD_DIR}/install/luarocks/bin
-bash ${TRAVIS_BUILD_DIR}/.travis/setup_lua.sh
+bash .travis/setup_lua.sh
 eval `$HOME/.lua/luarocks path`

+ 1 - 1
.travis/setup_lua.sh

@@ -11,7 +11,7 @@ set -eufo pipefail
 LUAJIT_VERSION="2.0.4"
 LUAJIT_BASE="LuaJIT-$LUAJIT_VERSION"
 
-source $TRAVIS_BUILD_DIR/.travis/platform.sh
+source .travis/platform.sh
 
 LUA_HOME_DIR=$TRAVIS_BUILD_DIR/install/lua
 

+ 3 - 1
tests/RunCi.hx

@@ -437,11 +437,12 @@ class RunCi {
 	}
 
 	static function getLuaDependencies(jit = false, lua_version = "lua5.2", luarocks_version = "2.3.0") {
+		var build_dir = Sys.getEnv("TRAVIS_BUILD_DIR");
+		changeDirectory(build_dir);
 		if (jit) Sys.putEnv("LUAJIT","yes");
 		Sys.putEnv("LUAROCKS", luarocks_version);
 		Sys.putEnv("LUA", lua_version);
 		// use the helper scripts in .travis
-		var build_dir = Sys.getEnv("TRAVIS_BUILD_DIR");
 		runCommand("sh", ['${build_dir}/.travis/setenv_lua.sh']);
 		if (jit){
 			runCommand("luajit", ["-v"]);
@@ -451,6 +452,7 @@ class RunCi {
 		runCommand("pip", ["install", "--user", "cpp-coveralls"]);
 		runCommand("luarocks", ["install", "lrexlib-pcre", "2.7.2-1", "--server=https://luarocks.org/dev"]);
 		runCommand("luarocks", ["install", "luautf8", "--server=https://luarocks.org/dev"]);
+		changeDirectory(unitDir);
 	}
 
 	static function getCsDependencies() {