From c31d872f189af30a072571c722278d069fb540f0 Mon Sep 17 00:00:00 2001 From: uramer Date: Sat, 11 Feb 2023 12:51:43 +0100 Subject: [PATCH] Use install_luadocumentor_in_docker for teal_ci --- CI/teal_ci.sh | 29 +------------------ .../source/install_luadocumentor_in_docker.sh | 5 ++-- 2 files changed, 3 insertions(+), 31 deletions(-) mode change 100644 => 100755 docs/source/install_luadocumentor_in_docker.sh diff --git a/CI/teal_ci.sh b/CI/teal_ci.sh index 722c39f7a8..990d12f9f8 100755 --- a/CI/teal_ci.sh +++ b/CI/teal_ci.sh @@ -1,36 +1,9 @@ pushd . -echo "Install lua 5.1" -cd ~ -curl -R -O https://www.lua.org/ftp/lua-5.1.5.tar.gz -tar -zxf lua-5.1.5.tar.gz -rm lua-5.1.5.tar.gz -cd lua-5.1.5/ -make linux -cd ~ -PATH=$PATH:~/lua-5.1.5/src +docs/source/install_luadocumentor_in_docker.sh -echo "Install luarocks" -luarocksV="3.9.2" -wget https://luarocks.org/releases/luarocks-$luarocksV.tar.gz -tar zxpf luarocks-$luarocksV.tar.gz -rm luarocks-$luarocksV.tar.gz -cd luarocks-$luarocksV/ -./configure --with-lua-bin=$HOME/lua-5.1.5/src --with-lua-include=$HOME/lua-5.1.5/src --prefix=$HOME/luarocks -make build -make install -cd ~ -rm -r luarocks-$luarocksV PATH=$PATH:~/luarocks/bin -echo "Install openmwluadocumentor" -git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git -cd openmw-luadocumentor -luarocks make luarocks/openmwluadocumentor-0.2.0-1.rockspec -cd ~ -rm -r openmw-luadocumentor - - echo "Install Teal Cyan" git clone https://github.com/teal-language/cyan.git --depth 1 cd cyan diff --git a/docs/source/install_luadocumentor_in_docker.sh b/docs/source/install_luadocumentor_in_docker.sh old mode 100644 new mode 100755 index e0b331a0a7..d65e25f85c --- a/docs/source/install_luadocumentor_in_docker.sh +++ b/docs/source/install_luadocumentor_in_docker.sh @@ -28,8 +28,7 @@ PATH=$PATH:~/luarocks/bin echo "Install openmwluadocumentor" git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git -cd openmw-luadocumentor/luarocks -luarocks --local pack openmwluadocumentor-0.2.0-1.rockspec -luarocks --local install openmwluadocumentor-0.2.0-1.src.rock +cd openmw-luadocumentor +luarocks make luarocks/openmwluadocumentor-0.2.0-1.rockspec cd ~ rm -r openmw-luadocumentor