diff --git a/.github/workflows/package-apisix-deb-ubuntu20.04.yml b/.github/workflows/package-apisix-deb-ubuntu20.04.yml index 444081a24..8755c3831 100644 --- a/.github/workflows/package-apisix-deb-ubuntu20.04.yml +++ b/.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: 2.13.1 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/package-apisix-rpm-el7.yml b/.github/workflows/package-apisix-rpm-el7.yml index 587fe4a56..12b47d852 100644 --- a/.github/workflows/package-apisix-rpm-el7.yml +++ b/.github/workflows/package-apisix-rpm-el7.yml @@ -40,7 +40,7 @@ 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=2.13.1 checkout=2.13.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,12 +75,12 @@ 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) 2.13.1 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-2.13.1-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) 2.13.1 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 @@ -88,10 +88,10 @@ jobs: exit 1 fi - - name: stop and uninstall APISIX(-remote) 2.10.1 + - name: stop and uninstall APISIX(-remote) 2.13.1 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-2.13.1" - name: install APISIX(-local) by rpm in container run: | diff --git a/.github/workflows/package-apisix-rpm-el8.yml b/.github/workflows/package-apisix-rpm-el8.yml index 20ae02fea..a93454433 100644 --- a/.github/workflows/package-apisix-rpm-el8.yml +++ b/.github/workflows/package-apisix-rpm-el8.yml @@ -40,7 +40,7 @@ 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=2.13.1 checkout=2.13.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,12 +80,12 @@ 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) 2.13.1 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-2.13.1-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) 2.13.1 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 @@ -93,10 +93,10 @@ jobs: exit 1 fi - - name: stop and uninstall APISIX(-remote) 2.10.1 + - name: stop and uninstall APISIX(-remote) 2.13.1 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-2.13.1" - name: install APISIX(-local) by rpm in container run: | diff --git a/build-apisix-base.sh b/build-apisix-base.sh index 9eb6e0c81..279b42448 100755 --- a/build-apisix-base.sh +++ b/build-apisix-base.sh @@ -12,6 +12,7 @@ if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then lua_var_nginx_module_ver="" debug_args="--with-debug" OR_PREFIX=${OR_PREFIX:="/usr/local/openresty-debug"} + add_shared_shdict_module="--add-module=../apisix-nginx-module/src/meta" else ngx_multi_upstream_module_ver="-b 1.0.1" mod_dubbo_ver="-b 1.0.2" @@ -20,6 +21,7 @@ else lua_var_nginx_module_ver="-b v0.5.2" debug_args=${debug_args:-} OR_PREFIX=${OR_PREFIX:="/usr/local/openresty"} + add_shared_shdict_module=${add_shared_shdict_module:-} fi prev_workdir="$PWD" @@ -92,6 +94,7 @@ cd openresty-${or_ver} || exit 1 --add-module=../ngx_multi_upstream_module \ --add-module=../apisix-nginx-module \ --add-module=../apisix-nginx-module/src/stream \ + $add_shared_shdict_module \ --add-module=../wasm-nginx-module \ --add-module=../lua-var-nginx-module \ --with-poll_module \