Merge branch 'master' into v1.2

apache · Apr 20, 2020 · 1070941 · 1070941
2 parents 3465713 + 7440192
commit 1070941
Show file tree

Hide file tree

Showing 50 changed files with 566 additions and 137 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,8 +38,6 @@ addons:
       - libssl-dev
       - perl
       - etcd
-      - luarocks
-      - lua-check
   homebrew:
     update: true
 

diff --git a/.travis/linux_apisix_current_luarocks_runner.sh b/.travis/linux_apisix_current_luarocks_runner.sh
@@ -30,7 +30,16 @@ do_install() {
     sudo add-apt-repository -y ppa:longsleep/golang-backports
 
     sudo apt-get update
-    sudo apt-get install openresty-debug
+    sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
+
+    wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+    tar -xf v2.4.4.tar.gz
+    cd luarocks-2.4.4
+    ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+    make build > build.log 2>&1 || (cat build.log && exit 1)
+    sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+    cd ..
+    rm -rf luarocks-2.4.4
 }
 
 script() {
@@ -39,9 +48,11 @@ script() {
     openresty -V
     sudo service etcd start
 
+    sudo rm -rf /usr/local/apisix
+
     # install APISIX with local version
-    sudo luarocks install rockspec/apisix-master-0.rockspec --only-deps
-    sudo luarocks make rockspec/apisix-master-0.rockspec
+    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)
 
     # show install file
     luarocks show apisix
@@ -60,8 +71,6 @@ script() {
         cat /usr/local/apisix/logs/error.log
         exit 1
     fi
-
-    sudo luarocks remove rockspec/apisix-master-0.rockspec
 }
 
 case_opt=$1

diff --git a/.travis/linux_apisix_master_luarocks_runner.sh b/.travis/linux_apisix_master_luarocks_runner.sh
@@ -30,7 +30,16 @@ do_install() {
     sudo add-apt-repository -y ppa:longsleep/golang-backports
 
     sudo apt-get update
-    sudo apt-get install openresty-debug
+    sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
+
+    wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+    tar -xf v2.4.4.tar.gz
+    cd luarocks-2.4.4
+    ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+    make build > build.log 2>&1 || (cat build.log && exit 1)
+    sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+    cd ..
+    rm -rf luarocks-2.4.4
 }
 
 script() {
@@ -39,19 +48,21 @@ script() {
     openresty -V
     sudo service etcd start
 
+    sudo rm -rf /usr/local/apisix
+
     # install APISIX by shell
     sudo mkdir -p /usr/local/apisix/deps
-    sudo PATH=$PATH ./utils/install-apisix.sh install
+    sudo PATH=$PATH ./utils/install-apisix.sh install > build.log 2>&1 || (cat build.log && exit 1)
 
     sudo PATH=$PATH apisix help
     sudo PATH=$PATH apisix init
     sudo PATH=$PATH apisix start
     sudo PATH=$PATH apisix stop
 
-    sudo PATH=$PATH ./utils/install-apisix.sh remove
+    sudo PATH=$PATH ./utils/install-apisix.sh remove > build.log 2>&1 || (cat build.log && exit 1)
 
     # install APISIX by luarocks
-    sudo luarocks install rockspec/apisix-master-0.rockspec
+    sudo luarocks install rockspec/apisix-master-0.rockspec > build.log 2>&1 || (cat build.log && exit 1)
 
     # show install files
     luarocks show apisix
@@ -68,9 +79,8 @@ script() {
     if [ -s /tmp/error.log ]; then
         echo "=====found error log====="
         cat /usr/local/apisix/logs/error.log
+        exit 1
     fi
-
-    sudo luarocks remove rockspec/apisix-master-0.rockspec
 }
 
 case_opt=$1

diff --git a/.travis/linux_openresty_runner.sh b/.travis/linux_openresty_runner.sh
@@ -23,8 +23,10 @@ export_or_prefix() {
 }
 
 create_lua_deps() {
-    sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}/luajit rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
     echo "Create lua deps cache"
+
+    make deps
+
     sudo rm -rf build-cache/deps
     sudo cp -r deps build-cache/
     sudo cp rockspec/apisix-master-0.rockspec build-cache/
@@ -45,20 +47,30 @@ before_install() {
 }
 
 do_install() {
+    export_or_prefix
+
     wget -qO - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
     sudo apt-get -y update --fix-missing
     sudo apt-get -y install software-properties-common
     sudo add-apt-repository -y "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main"
     sudo add-apt-repository -y ppa:longsleep/golang-backports
 
     sudo apt-get update
+    sudo apt-get install openresty-debug lua5.1 liblua5.1-0-dev
 
-    sudo apt-get install openresty-debug
-    sudo luarocks install --lua-dir=${OPENRESTY_PREFIX}/luajit luacov-coveralls
+    wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+    tar -xf v2.4.4.tar.gz
+    cd luarocks-2.4.4
+    ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+    make build > build.log 2>&1 || (cat build.log && exit 1)
+    sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+    cd ..
+    rm -rf luarocks-2.4.4
 
-    export GO111MOUDULE=on
+    sudo luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+    sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
 
-    export_or_prefix
+    export GO111MOUDULE=on
 
     if [ ! -f "build-cache/apisix-master-0.rockspec" ]; then
         create_lua_deps
@@ -74,6 +86,9 @@ do_install() {
         fi
     fi
 
+    # sudo apt-get install tree -y
+    # tree deps
+
     git clone https://github.com/iresty/test-nginx.git test-nginx
     make utils
 
@@ -116,8 +131,9 @@ script() {
     ./bin/apisix init
     ./bin/apisix init_etcd
     ./bin/apisix start
-    mkdir -p logs
+
     sleep 1
+    cat logs/error.log
 
     sudo sh ./t/grpc-proxy-test.sh
     sleep 1

diff --git a/.travis/linux_tengine_runner.sh b/.travis/linux_tengine_runner.sh
@@ -23,8 +23,11 @@ export_or_prefix() {
 }
 
 create_lua_deps() {
-    sudo luarocks make --lua-dir=${OPENRESTY_PREFIX}/luajit rockspec/apisix-master-0.rockspec --tree=deps --only-deps --local
     echo "Create lua deps cache"
+
+    rm -rf deps
+    make deps
+
     sudo rm -rf build-cache/deps
     sudo cp -r deps build-cache/
     sudo cp rockspec/apisix-master-0.rockspec build-cache/
@@ -212,10 +215,18 @@ do_install() {
     sudo add-apt-repository -y ppa:longsleep/golang-backports
 
     sudo apt-get update
+    sudo apt-get install lua5.1 liblua5.1-0-dev
 
     tengine_install
 
-    sudo luarocks install --lua-dir=${OPENRESTY_PREFIX}/luajit luacov-coveralls
+    wget https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz
+    tar -xf v2.4.4.tar.gz
+    cd luarocks-2.4.4
+    ./configure --prefix=/usr > build.log 2>&1 || (cat build.log && exit 1)
+    make build > build.log 2>&1 || (cat build.log && exit 1)
+    sudo make install > build.log 2>&1 || (cat build.log && exit 1)
+    cd ..
+    rm -rf luarocks-2.4.4
 
     export GO111MOUDULE=on
 
@@ -233,6 +244,9 @@ do_install() {
         fi
     fi
 
+    luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
+    sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
+
     git clone https://github.com/iresty/test-nginx.git test-nginx
     make utils