This is an automated email from the ASF dual-hosted git repository.
nic-6443 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 f434e1bfa chore: use apisix-runtime 1.3.6 (#13412)
f434e1bfa is described below
commit f434e1bfa86939e229cca5c85dbe24444a3d7fa2
Author: Nic <[email protected]>
AuthorDate: Fri May 22 13:51:04 2026 +0800
chore: use apisix-runtime 1.3.6 (#13412)
---
.github/workflows/build.yml | 4 +---
.github/workflows/cli.yml | 4 +---
.github/workflows/code-lint.yml | 1 -
.github/workflows/gm-cron.yaml.disabled | 4 +---
.github/workflows/gm.yml.disabled | 4 +---
.github/workflows/kubernetes-ci.yml | 3 +--
.github/workflows/tars-ci.yml | 3 +--
.requirements | 2 +-
ci/linux-install-openresty.sh | 16 +++++++---------
...x_apisix_current_luarocks_in_customed_nginx_runner.sh | 2 --
ci/linux_openresty_runner.sh | 2 --
ci/linux_openresty_tongsuo_runner.sh | 1 -
12 files changed, 14 insertions(+), 32 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index db74bfb4c..f600c983f 100644
--- a/.github/workflows/build.yml
+++ b/.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: |
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index c6a12ea2d..5995ae0f4 100644
--- a/.github/workflows/cli.yml
+++ b/.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: |
diff --git a/.github/workflows/code-lint.yml b/.github/workflows/code-lint.yml
index 846ea6899..bec199a8f 100644
--- a/.github/workflows/code-lint.yml
+++ b/.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
diff --git a/.github/workflows/gm-cron.yaml.disabled
b/.github/workflows/gm-cron.yaml.disabled
index 46447e41e..bc6360bc5 100644
--- a/.github/workflows/gm-cron.yaml.disabled
+++ b/.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:
diff --git a/.github/workflows/gm.yml.disabled
b/.github/workflows/gm.yml.disabled
index 44260e0fc..e64056e96 100644
--- a/.github/workflows/gm.yml.disabled
+++ b/.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:
diff --git a/.github/workflows/kubernetes-ci.yml
b/.github/workflows/kubernetes-ci.yml
index 5487df3a6..f78d4ed77 100644
--- a/.github/workflows/kubernetes-ci.yml
+++ b/.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: |
diff --git a/.github/workflows/tars-ci.yml b/.github/workflows/tars-ci.yml
index 3eb4c3f2d..d0eebb921 100644
--- a/.github/workflows/tars-ci.yml
+++ b/.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: |
diff --git a/.requirements b/.requirements
index 6a4f95a9e..b599f80cd 100644
--- a/.requirements
+++ b/.requirements
@@ -17,5 +17,5 @@
APISIX_PACKAGE_NAME=apisix
-APISIX_RUNTIME=1.3.5
+APISIX_RUNTIME=1.3.6
APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e
diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh
index 465df32bb..1279cc1bc 100755
--- a/ci/linux-install-openresty.sh
+++ b/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
diff --git a/ci/linux_apisix_current_luarocks_in_customed_nginx_runner.sh
b/ci/linux_apisix_current_luarocks_in_customed_nginx_runner.sh
index 3eaba07ec..c7e843e58 100755
--- a/ci/linux_apisix_current_luarocks_in_customed_nginx_runner.sh
+++ b/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
diff --git a/ci/linux_openresty_runner.sh b/ci/linux_openresty_runner.sh
index 2e39224ef..98422873e 100755
--- a/ci/linux_openresty_runner.sh
+++ b/ci/linux_openresty_runner.sh
@@ -16,6 +16,4 @@
# limitations under the License.
#
-
-export OPENRESTY_VERSION=source
. ./ci/linux_openresty_common_runner.sh
diff --git a/ci/linux_openresty_tongsuo_runner.sh
b/ci/linux_openresty_tongsuo_runner.sh
index 2afdceaf9..973277300 100755
--- a/ci/linux_openresty_tongsuo_runner.sh
+++ b/ci/linux_openresty_tongsuo_runner.sh
@@ -15,7 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-export OPENRESTY_VERSION=source
export SSL_LIB_VERSION=tongsuo
