feat: upgrade apisix-nginx-module to 1.7.0 & wasm-nginx-module to 0.6.0 (#191)

Author: spacewander

.github/workflows/package-apisix-deb-ubuntu20.04.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     env:
-      PACKAGE_APISIX_VERSION: 2.12.0
+      PACKAGE_APISIX_VERSION: 0.0.0
 
     steps:
       - uses: actions/checkout@v2
@@ -30,8 +30,8 @@ jobs:
 
       - name: run apisix packaging
         run: |
-          make package type=deb app=apisix version=master checkout=master image_base=ubuntu image_tag=20.04
-          make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} checkout=${PACKAGE_APISIX_VERSION}
+          make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} checkout=master \
+            image_base=ubuntu image_tag=20.04
 
       - name: install apisix deb into container
         run: |

.github/workflows/package-apisix-rpm-el7.yml

@@ -39,8 +39,6 @@ jobs:
 
       - name: packaging APISIX(-remote) with remote code
         run: |
-          make package type=rpm app=apisix version=2.7 checkout=release/2.7 image_base=centos image_tag=7 artifact=apisix-remote
-          make package type=rpm app=apisix version=2.10.1 checkout=2.10.1 image_base=centos image_tag=7 artifact=apisix-remote
           make package type=rpm app=apisix version=master checkout=master image_base=centos image_tag=7 artifact=apisix-remote
 
       - name: packaging APISIX(-local) with local code
@@ -75,23 +73,23 @@ jobs:
           docker exec centos7Instance bash -c "pkill -f nginx"
           docker exec centos7Instance bash -c "yum -y erase apisix-remote-master"
 
-      - name: install APISIX(-remote) 2.10.1 by rpm in container
+      - name: install APISIX(-remote) master by rpm in container
         run: |
-          docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-remote-2.10.1-0.el7.x86_64.rpm"
+          docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-remote-master-0.el7.x86_64.rpm"
           docker exec centos7Instance bash -c "apisix start"
 
-      - name: check and ensure APISIX(-remote) 2.10.1 is installed
+      - name: check and ensure APISIX(-remote) master is installed
         run: |
           code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9080/apisix/admin/routes -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1')
           if [ ! $code -eq 200 ]; then
               echo "failed: failed to install Apache APISIX by rpm"
               exit 1
           fi
 
-      - name: stop and uninstall APISIX(-remote) 2.10.1
+      - name: stop and uninstall APISIX(-remote) master
         run: |
           docker exec centos7Instance bash -c "pkill -f nginx"
-          docker exec centos7Instance bash -c "yum -y erase apisix-remote-2.10.1"
+          docker exec centos7Instance bash -c "yum -y erase apisix-remote-master"
 
       - name: install APISIX(-local) by rpm in container
         run: |

.github/workflows/package-apisix-rpm-el8.yml

@@ -39,8 +39,6 @@ jobs:
 
       - name: packaging APISIX(-remote) with remote code
         run: |
-          make package type=rpm app=apisix version=2.7 checkout=release/2.7 image_base=centos image_tag=8 artifact=apisix-remote
-          make package type=rpm app=apisix version=2.10.1 checkout=2.10.1 image_base=centos image_tag=8 artifact=apisix-remote
           make package type=rpm app=apisix version=master checkout=master image_base=centos image_tag=8 artifact=apisix-remote
 
       - name: packaging APISIX(-local) with local code
@@ -80,23 +78,23 @@ jobs:
           docker exec centos8Instance bash -c "pkill -f nginx"
           docker exec centos8Instance bash -c "yum -y erase apisix-remote-master"
 
-      - name: install APISIX(-remote) 2.10.1 by rpm in container
+      - name: install APISIX(-remote) master by rpm in container
         run: |
-          docker exec centos8Instance bash -c "yum -y localinstall /output/apisix-remote-2.10.1-0.el8.x86_64.rpm"
+          docker exec centos8Instance bash -c "yum -y localinstall /output/apisix-remote-master-0.el8.x86_64.rpm"
           docker exec centos8Instance bash -c "apisix start"
 
-      - name: check and ensure APISIX(-remote) 2.10.1 is installed
+      - name: check and ensure APISIX(-remote) master is installed
         run: |
           code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9080/apisix/admin/routes -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1')
           if [ ! $code -eq 200 ]; then
               echo "failed: failed to install Apache APISIX by rpm"
               exit 1
           fi
 
-      - name: stop and uninstall APISIX(-remote) 2.10.1
+      - name: stop and uninstall APISIX(-remote) master
         run: |
           docker exec centos8Instance bash -c "pkill -f nginx"
-          docker exec centos8Instance bash -c "yum -y erase apisix-remote-2.10.1"
+          docker exec centos8Instance bash -c "yum -y erase apisix-remote-master"
 
       - name: install APISIX(-local) by rpm in container
         run: |

build-apisix-base.sh

@@ -15,8 +15,8 @@ if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
 else
     ngx_multi_upstream_module_ver="-b 1.0.1"
     mod_dubbo_ver="-b 1.0.2"
-    apisix_nginx_module_ver="-b 1.6.0"
-    wasm_nginx_module_ver="-b 0.5.1"
+    apisix_nginx_module_ver="-b 1.7.0"
+    wasm_nginx_module_ver="-b 0.6.0"
     lua_var_nginx_module_ver="-b v0.5.2"
     debug_args=${debug_args:-}
     OR_PREFIX=${OR_PREFIX:="/usr/local/openresty"}