chore: use apisix-runtime 1.3.6 (#13412)

Author: nic-6443

.github/workflows/build.yml

@@ -38,7 +38,6 @@ jobs:
     timeout-minutes: 90
     env:
       SERVER_NAME: ${{ matrix.os_name }}
-      OPENRESTY_VERSION: default
 
     steps:
       - name: Check out code
@@ -87,8 +86,7 @@ jobs:
 
       - name: Linux Install
         run: |
-          sudo --preserve-env=OPENRESTY_VERSION \
-          ./ci/${{ matrix.os_name }}_runner.sh do_install
+          sudo ./ci/${{ matrix.os_name }}_runner.sh do_install
 
       - name: Linux launch common services
         run: |

.github/workflows/cli.yml

@@ -34,7 +34,6 @@ jobs:
     timeout-minutes: 30
     env:
       SERVER_NAME: ${{ matrix.job_name }}
-      OPENRESTY_VERSION: default
 
     steps:
       - name: Check out code
@@ -60,8 +59,7 @@ jobs:
 
       - name: Linux Install
         run: |
-            sudo --preserve-env=OPENRESTY_VERSION \
-            ./ci/${{ matrix.job_name }}_runner.sh do_install
+            sudo ./ci/${{ matrix.job_name }}_runner.sh do_install
 
       - name: Linux Script
         run: |

.github/workflows/code-lint.yml

@@ -20,7 +20,6 @@ jobs:
       run: |
         . ./ci/common.sh
         export_or_prefix
-        export OPENRESTY_VERSION=default
 
         sudo -E ./ci/linux-install-openresty.sh
         ./utils/linux-install-luarocks.sh

.github/workflows/gm-cron.yaml.disabled

@@ -27,7 +27,6 @@ jobs:
     timeout-minutes: 90
     env:
       SERVER_NAME: ${{ matrix.os_name }}
-      OPENRESTY_VERSION: default
 
     # TODO: refactor the workflows to reduce duplicate parts. Maybe we can write them in shell
     # scripts or a separate action?
@@ -166,8 +165,7 @@ jobs:
 
       - name: Linux Install
         run: |
-          sudo --preserve-env=OPENRESTY_VERSION \
-          ./ci/${{ matrix.os_name }}_runner.sh do_install
+          sudo ./ci/${{ matrix.os_name }}_runner.sh do_install
 
       - name: Linux Script
         env:

.github/workflows/gm.yml.disabled

@@ -35,7 +35,6 @@ jobs:
     timeout-minutes: 90
     env:
       SERVER_NAME: ${{ matrix.os_name }}
-      OPENRESTY_VERSION: default
 
     steps:
       - name: Check out code
@@ -83,8 +82,7 @@ jobs:
 
       - name: Linux Do install
         run: |
-          sudo --preserve-env=OPENRESTY_VERSION \
-            ./ci/${{ matrix.os_name }}_runner.sh do_install
+          sudo ./ci/${{ matrix.os_name }}_runner.sh do_install
 
       - name: Linux Script
         env:

.github/workflows/kubernetes-ci.yml

@@ -33,7 +33,6 @@ jobs:
     timeout-minutes: 15
     env:
       SERVER_NAME: ${{ matrix.os_name }}
-      OPENRESTY_VERSION: default
 
     steps:
       - name: Check out code
@@ -74,7 +73,7 @@ jobs:
       - name: Linux Install
         run: |
           sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
-          sudo --preserve-env=OPENRESTY_VERSION ./ci/${{ matrix.os_name }}_runner.sh do_install
+          sudo ./ci/${{ matrix.os_name }}_runner.sh do_install
 
       - name: Run test cases
         run: |

.github/workflows/tars-ci.yml

@@ -33,7 +33,6 @@ jobs:
     timeout-minutes: 15
     env:
       SERVER_NAME: ${{ matrix.os_name }}
-      OPENRESTY_VERSION: default
 
     steps:
       - name: Check out code
@@ -48,7 +47,7 @@ jobs:
       - name: Linux Install
         run: |
           sudo ./ci/${{ matrix.os_name }}_runner.sh before_install
-          sudo --preserve-env=OPENRESTY_VERSION ./ci/${{ matrix.os_name }}_runner.sh do_install
+          sudo ./ci/${{ matrix.os_name }}_runner.sh do_install
 
       - name: Run test cases
         run: |

.requirements

@@ -17,5 +17,5 @@
 
 APISIX_PACKAGE_NAME=apisix
 
-APISIX_RUNTIME=1.3.5
+APISIX_RUNTIME=1.3.6
 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e

ci/linux-install-openresty.sh

@@ -40,15 +40,13 @@ sudo apt-get install -y openresty-pcre-dev openresty-zlib-dev build-essential gc
 SSL_LIB_VERSION=${SSL_LIB_VERSION-openssl}
 ENABLE_FIPS=${ENABLE_FIPS:-"false"}
 
-if [ "$OPENRESTY_VERSION" == "source" ]; then
-    if [ "$SSL_LIB_VERSION" == "tongsuo" ]; then
-        export openssl_prefix=/usr/local/tongsuo
-        export zlib_prefix=$OPENRESTY_PREFIX/zlib
-        export pcre_prefix=$OPENRESTY_PREFIX/pcre
-
-        export cc_opt="-DNGX_LUA_ABORT_AT_PANIC -I${zlib_prefix}/include -I${pcre_prefix}/include -I${openssl_prefix}/include"
-        export ld_opt="-L${zlib_prefix}/lib -L${pcre_prefix}/lib -L${openssl_prefix}/lib64 -Wl,-rpath,${zlib_prefix}/lib:${pcre_prefix}/lib:${openssl_prefix}/lib64"
-    fi
+if [ "$SSL_LIB_VERSION" == "tongsuo" ]; then
+    export openssl_prefix=/usr/local/tongsuo
+    export zlib_prefix=$OPENRESTY_PREFIX/zlib
+    export pcre_prefix=$OPENRESTY_PREFIX/pcre
+
+    export cc_opt="-DNGX_LUA_ABORT_AT_PANIC -I${zlib_prefix}/include -I${pcre_prefix}/include -I${openssl_prefix}/include"
+    export ld_opt="-L${zlib_prefix}/lib -L${pcre_prefix}/lib -L${openssl_prefix}/lib64 -Wl,-rpath,${zlib_prefix}/lib:${pcre_prefix}/lib:${openssl_prefix}/lib64"
 fi
 
 install_apisix_runtime

ci/linux_apisix_current_luarocks_in_customed_nginx_runner.sh

@@ -16,6 +16,4 @@
 # limitations under the License.
 #
 
-
-export OPENRESTY_VERSION=source
 . ./ci/linux_apisix_current_luarocks_runner.sh