This is an automated email from the ASF dual-hosted git repository. membphis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push: new 72eef02 CI: run the APISIX instance in an empty folder for `linux_apisix_current_luarocks`. (#2385) 72eef02 is described below commit 72eef02061a709869d16440490d6103068a8376f Author: YuanSheng Wang <membp...@gmail.com> AuthorDate: Sun Oct 11 12:59:54 2020 +0800 CI: run the APISIX instance in an empty folder for `linux_apisix_current_luarocks`. (#2385) fix #2384 --- .travis/linux_apisix_current_luarocks_runner.sh | 10 +++++++--- .travis/linux_apisix_master_luarocks_runner.sh | 9 --------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.travis/linux_apisix_current_luarocks_runner.sh b/.travis/linux_apisix_current_luarocks_runner.sh index 894542a..23bb3f9 100755 --- a/.travis/linux_apisix_current_luarocks_runner.sh +++ b/.travis/linux_apisix_current_luarocks_runner.sh @@ -60,6 +60,8 @@ script() { sudo luarocks install rockspec/apisix-master-0.rockspec --only-deps > build.log 2>&1 || (cat build.log && exit 1) sudo luarocks make rockspec/apisix-master-0.rockspec > build.log 2>&1 || (cat build.log && exit 1) + mkdir cli_tmp && cd cli_tmp + # show install file luarocks show apisix @@ -68,15 +70,17 @@ script() { sudo PATH=$PATH apisix start sudo PATH=$PATH apisix stop - # apisix cli test - sudo PATH=$PATH .travis/apisix_cli_test.sh - cat /usr/local/apisix/logs/error.log | grep '\[error\]' > /tmp/error.log | true if [ -s /tmp/error.log ]; then echo "=====found error log=====" cat /usr/local/apisix/logs/error.log exit 1 fi + + cd .. + + # apisix cli test + sudo PATH=$PATH .travis/apisix_cli_test.sh } case_opt=$1 diff --git a/.travis/linux_apisix_master_luarocks_runner.sh b/.travis/linux_apisix_master_luarocks_runner.sh index a657d91..1a992ae 100755 --- a/.travis/linux_apisix_master_luarocks_runner.sh +++ b/.travis/linux_apisix_master_luarocks_runner.sh @@ -64,10 +64,6 @@ script() { sudo mkdir -p /usr/local/apisix/deps sudo PATH=$PATH ./utils/install-apisix.sh install > build.log 2>&1 || (cat build.log && exit 1) - # REMOVE ME !!!! after PR merged: https://github.com/apache/apisix/pull/2383 - sudo mkdir -p /usr/local/apisix/apisix/ssl/router - sudo wget -P /usr/local/apisix/apisix/ssl/router/ https://raw.githubusercontent.com/apache/apisix/master/apisix/ssl/router/radixtree_sni.lua - sudo PATH=$PATH apisix help sudo PATH=$PATH apisix init sudo PATH=$PATH apisix start @@ -78,11 +74,6 @@ script() { # install APISIX by luarocks sudo luarocks install $APISIX_MAIN > build.log 2>&1 || (cat build.log && exit 1) - # REMOVE ME !!!! after PR merged: https://github.com/apache/apisix/pull/2383 - sudo mkdir -p /usr/local/apisix/apisix/ssl/router - sudo wget -P /usr/local/apisix/apisix/ssl/router/ https://raw.githubusercontent.com/apache/apisix/master/apisix/ssl/router/radixtree_sni.lua - ls /usr/local/apisix/apisix/ssl/router - # show install files luarocks show apisix