From f676e34314eccee10842066c03ee4c2998128b34 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 17:11:10 +0800 Subject: [PATCH 01/22] chore: validate OpenResty 1.29.2.4 runtime --- .requirements | 3 ++- ci/common.sh | 3 ++- ci/linux-install-openresty.sh | 5 +++-- ci/redhat-ci.sh | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.requirements b/.requirements index 6a4f95a9ec3a..c1f1faf07894 100644 --- a/.requirements +++ b/.requirements @@ -17,5 +17,6 @@ APISIX_PACKAGE_NAME=apisix -APISIX_RUNTIME=1.3.5 +APISIX_RUNTIME=1.3.6-dev +APISIX_BUILD_TOOLS_REF=478d4f5aeb40da4db00478747972f1b6d3772d02 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e diff --git a/ci/common.sh b/ci/common.sh index 30ea4a46ffad..e9c8381de513 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -94,7 +94,8 @@ install_curl () { install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME} - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" + local build_tools_ref="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${build_tools_ref}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh ./build-apisix-runtime.sh latest } diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh index 465df32bb694..3539f73f4a94 100755 --- a/ci/linux-install-openresty.sh +++ b/ci/linux-install-openresty.sh @@ -54,8 +54,9 @@ fi install_apisix_runtime if [ ! "$ENABLE_FIPS" == "true" ]; then -curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ - https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/conf/openssl3/openssl.cnf + APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" + curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ + "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/conf/openssl3/openssl.cnf" fi # patch lua-resty-events diff --git a/ci/redhat-ci.sh b/ci/redhat-ci.sh index 97492a6e63f2..399e11fb4f62 100755 --- a/ci/redhat-ci.sh +++ b/ci/redhat-ci.sh @@ -39,8 +39,9 @@ install_dependencies() { yum install -y openresty-pcre-devel openresty-zlib-devel install_apisix_runtime + APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ - https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/conf/openssl3/openssl.cnf + "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/conf/openssl3/openssl.cnf" # patch lua-resty-events sed -i 's/log(ERR, "event worker failed: ", perr)/log(ngx.WARN, "event worker failed: ", perr)/' /usr/local/openresty/lualib/resty/events/worker.lua From a4436cb46084585db6c95e4c2939717ab40fd4a6 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 17:55:01 +0800 Subject: [PATCH 02/22] chore: pin latest runtime validation commit --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index c1f1faf07894..050922d3c508 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=478d4f5aeb40da4db00478747972f1b6d3772d02 +APISIX_BUILD_TOOLS_REF=98b4b9061d83793033585448088315b472b230d6 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From d74863fecd8b9c36e13ca45e95cc58d1ca81a442 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:01:08 +0800 Subject: [PATCH 03/22] chore: pin latest runtime validation commit --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 050922d3c508..1d7982375fcc 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=98b4b9061d83793033585448088315b472b230d6 +APISIX_BUILD_TOOLS_REF=de59596292403088f60d495f8d5e1c77cd1047c0 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From dc7f91235886b1ecac6029af222205cece4ecbc6 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:02:54 +0800 Subject: [PATCH 04/22] chore: pin latest runtime validation commit --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 1d7982375fcc..10f9da6eb788 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=de59596292403088f60d495f8d5e1c77cd1047c0 +APISIX_BUILD_TOOLS_REF=329483741e7cc4d8b0010155f69f0e46a7a32605 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 31af10f9d4e6e2bb18992dc192beb835326fa9f8 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:04:23 +0800 Subject: [PATCH 05/22] ci: fail fast when fetching runtime config --- ci/linux-install-openresty.sh | 2 +- ci/redhat-ci.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh index 3539f73f4a94..e700bde7c7a5 100755 --- a/ci/linux-install-openresty.sh +++ b/ci/linux-install-openresty.sh @@ -55,7 +55,7 @@ install_apisix_runtime if [ ! "$ENABLE_FIPS" == "true" ]; then APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" - curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ + curl -fsSL -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/conf/openssl3/openssl.cnf" fi diff --git a/ci/redhat-ci.sh b/ci/redhat-ci.sh index 399e11fb4f62..af73e500476c 100755 --- a/ci/redhat-ci.sh +++ b/ci/redhat-ci.sh @@ -40,7 +40,7 @@ install_dependencies() { install_apisix_runtime APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" - curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ + curl -fsSL -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/conf/openssl3/openssl.cnf" # patch lua-resty-events From d3bc61cd8dede80504947fb108e9b55de4e89f66 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:08:54 +0800 Subject: [PATCH 06/22] ci: reuse pinned build tools for dependency installs --- .requirements | 2 +- utils/install-dependencies.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.requirements b/.requirements index 10f9da6eb788..a25041ab8f19 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=329483741e7cc4d8b0010155f69f0e46a7a32605 +APISIX_BUILD_TOOLS_REF=a276e7a85aa1408238fa2d2151074215e1e1db4f APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh index 74c646b8fe77..cd5750fd6fd9 100755 --- a/utils/install-dependencies.sh +++ b/utils/install-dependencies.sh @@ -129,7 +129,8 @@ function multi_distro_uninstallation() { function install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME:?} - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" + APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh ./build-apisix-runtime.sh latest rm build-apisix-runtime.sh From 8f3e0ed5c5fb9b01c25e2bb75929458fb98525bd Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:14:17 +0800 Subject: [PATCH 07/22] ci: avoid passing runtime selector to build tools --- ci/common.sh | 6 +++++- utils/install-dependencies.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci/common.sh b/ci/common.sh index e9c8381de513..c52c5364f277 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -97,7 +97,11 @@ install_apisix_runtime() { local build_tools_ref="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${build_tools_ref}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - ./build-apisix-runtime.sh latest + if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then + OPENRESTY_VERSION= ./build-apisix-runtime.sh latest + else + ./build-apisix-runtime.sh latest + fi } install_grpcurl () { diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh index cd5750fd6fd9..79e16120b81b 100755 --- a/utils/install-dependencies.sh +++ b/utils/install-dependencies.sh @@ -132,7 +132,11 @@ function install_apisix_runtime() { APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - ./build-apisix-runtime.sh latest + if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then + OPENRESTY_VERSION= ./build-apisix-runtime.sh latest + else + ./build-apisix-runtime.sh latest + fi rm build-apisix-runtime.sh } From 1bbc054a1a727ddc528e415f58e7ef52da8e7f00 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:21:20 +0800 Subject: [PATCH 08/22] chore: pin latest runtime validation commit --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index a25041ab8f19..f9f5e2ec1760 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=a276e7a85aa1408238fa2d2151074215e1e1db4f +APISIX_BUILD_TOOLS_REF=fca6ee31fca62996ba6fe04165af02a02671ae68 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 9eb11b2376ba74453065648a20f06b83584c4e0c Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:28:22 +0800 Subject: [PATCH 09/22] ci: satisfy shellcheck for runtime selector reset --- ci/common.sh | 2 +- utils/install-dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/common.sh b/ci/common.sh index c52c5364f277..2127e5767928 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -98,7 +98,7 @@ install_apisix_runtime() { wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${build_tools_ref}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then - OPENRESTY_VERSION= ./build-apisix-runtime.sh latest + OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest else ./build-apisix-runtime.sh latest fi diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh index 79e16120b81b..5fda767f8f07 100755 --- a/utils/install-dependencies.sh +++ b/utils/install-dependencies.sh @@ -133,7 +133,7 @@ function install_apisix_runtime() { wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then - OPENRESTY_VERSION= ./build-apisix-runtime.sh latest + OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest else ./build-apisix-runtime.sh latest fi From e9d1b3d2d767e29cc15de360dec4fa54ffdfb2ba Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 18:49:41 +0800 Subject: [PATCH 10/22] ci: use runtime build with TLS FFI fix --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index f9f5e2ec1760..9a7df546c4a2 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=fca6ee31fca62996ba6fe04165af02a02671ae68 +APISIX_BUILD_TOOLS_REF=24fd11996ed52ea3798902111a0439a39b8a2ccd APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From a6f11b42f218f5f147727360408bcbe528f6579b Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 19:05:47 +0800 Subject: [PATCH 11/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 9a7df546c4a2..47f6fd5e0142 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=24fd11996ed52ea3798902111a0439a39b8a2ccd +APISIX_BUILD_TOOLS_REF=64f38e5a349ae9d1f16d00aa72c8375d8fd70f84 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 80db15aa01ce3a5589edc3ec8b8495d993188a76 Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 19:11:07 +0800 Subject: [PATCH 12/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 47f6fd5e0142..882ae6cc987a 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=64f38e5a349ae9d1f16d00aa72c8375d8fd70f84 +APISIX_BUILD_TOOLS_REF=927703d8322217e382808eca595acc7e915a53fb APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From e7aa13f7570a56027305f501d4c6ec4f9a8273ec Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 19:15:33 +0800 Subject: [PATCH 13/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 882ae6cc987a..680fb952c02c 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=927703d8322217e382808eca595acc7e915a53fb +APISIX_BUILD_TOOLS_REF=5290f9cecd0df31d91a818779d960ac634bef50c APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From f1cc80a7af3be080096d034adf598bd710689c1a Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 19:21:20 +0800 Subject: [PATCH 14/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 680fb952c02c..61c0e691ae80 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=5290f9cecd0df31d91a818779d960ac634bef50c +APISIX_BUILD_TOOLS_REF=2612ee6f1d4f8c9c3737dd1914f1bccb767f0285 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From ff3065791eadb20e7d78c4e2b0494939c1a118be Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 20:15:27 +0800 Subject: [PATCH 15/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 61c0e691ae80..89b6f0184033 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=2612ee6f1d4f8c9c3737dd1914f1bccb767f0285 +APISIX_BUILD_TOOLS_REF=7b4d616bfa404a66bb0bbde41e131e6ce13cc089 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 8ac4fd4060383f23085664f8c8a8b12d077fd8db Mon Sep 17 00:00:00 2001 From: Nic Date: Thu, 21 May 2026 20:35:50 +0800 Subject: [PATCH 16/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 89b6f0184033..7ca40131ad4d 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=7b4d616bfa404a66bb0bbde41e131e6ce13cc089 +APISIX_BUILD_TOOLS_REF=acecf2cf6df577f3c5391cf77f74d9b35bb981e4 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 5461c8d944f70ff94c9a3bdccd1927ad102c1186 Mon Sep 17 00:00:00 2001 From: Nic Date: Fri, 22 May 2026 09:27:05 +0800 Subject: [PATCH 17/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index 7ca40131ad4d..cc527566fb75 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=acecf2cf6df577f3c5391cf77f74d9b35bb981e4 +APISIX_BUILD_TOOLS_REF=206545deeee3aecc1a2e02ab441ff4ec92ca43b9 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 66fe88e129d70c715d7929f1eede0e01f8c7f699 Mon Sep 17 00:00:00 2001 From: Nic Date: Fri, 22 May 2026 09:36:28 +0800 Subject: [PATCH 18/22] chore: update runtime build tools ref --- .requirements | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.requirements b/.requirements index cc527566fb75..fb137097b361 100644 --- a/.requirements +++ b/.requirements @@ -18,5 +18,5 @@ APISIX_PACKAGE_NAME=apisix APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=206545deeee3aecc1a2e02ab441ff4ec92ca43b9 +APISIX_BUILD_TOOLS_REF=5188d24c1ff630af7bcbcbbeaa509bf00f986739 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 9a2415a2909b4be9a16f5f8f3011ecd4e5c732d8 Mon Sep 17 00:00:00 2001 From: Nic Date: Fri, 22 May 2026 11:07:51 +0800 Subject: [PATCH 19/22] chore: use apisix-runtime 1.3.6 --- .requirements | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.requirements b/.requirements index fb137097b361..b599f80cd120 100644 --- a/.requirements +++ b/.requirements @@ -17,6 +17,5 @@ APISIX_PACKAGE_NAME=apisix -APISIX_RUNTIME=1.3.6-dev -APISIX_BUILD_TOOLS_REF=5188d24c1ff630af7bcbcbbeaa509bf00f986739 +APISIX_RUNTIME=1.3.6 APISIX_DASHBOARD_COMMIT=bbe05ad95396f90db03d831660f454c2844d906e From 23c8dea1a84cd6b83e06df39154167233706c939 Mon Sep 17 00:00:00 2001 From: Nic Date: Fri, 22 May 2026 11:19:53 +0800 Subject: [PATCH 20/22] chore: keep runtime bump scoped to requirements --- ci/common.sh | 9 ++------- ci/linux-install-openresty.sh | 5 ++--- ci/redhat-ci.sh | 5 ++--- utils/install-dependencies.sh | 9 ++------- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/ci/common.sh b/ci/common.sh index 2127e5767928..30ea4a46ffad 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -94,14 +94,9 @@ install_curl () { install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME} - local build_tools_ref="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${build_tools_ref}/build-apisix-runtime.sh" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then - OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest - else - ./build-apisix-runtime.sh latest - fi + ./build-apisix-runtime.sh latest } install_grpcurl () { diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh index e700bde7c7a5..465df32bb694 100755 --- a/ci/linux-install-openresty.sh +++ b/ci/linux-install-openresty.sh @@ -54,9 +54,8 @@ fi install_apisix_runtime if [ ! "$ENABLE_FIPS" == "true" ]; then - APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" - curl -fsSL -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ - "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/conf/openssl3/openssl.cnf" +curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ + https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/conf/openssl3/openssl.cnf fi # patch lua-resty-events diff --git a/ci/redhat-ci.sh b/ci/redhat-ci.sh index af73e500476c..97492a6e63f2 100755 --- a/ci/redhat-ci.sh +++ b/ci/redhat-ci.sh @@ -39,9 +39,8 @@ install_dependencies() { yum install -y openresty-pcre-devel openresty-zlib-devel install_apisix_runtime - APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" - curl -fsSL -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ - "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/conf/openssl3/openssl.cnf" + curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \ + https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/conf/openssl3/openssl.cnf # patch lua-resty-events sed -i 's/log(ERR, "event worker failed: ", perr)/log(ngx.WARN, "event worker failed: ", perr)/' /usr/local/openresty/lualib/resty/events/worker.lua diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh index 5fda767f8f07..74c646b8fe77 100755 --- a/utils/install-dependencies.sh +++ b/utils/install-dependencies.sh @@ -129,14 +129,9 @@ function multi_distro_uninstallation() { function install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME:?} - APISIX_BUILD_TOOLS_REF="${APISIX_BUILD_TOOLS_REF:-apisix-runtime/${APISIX_RUNTIME}}" - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/${APISIX_BUILD_TOOLS_REF}/build-apisix-runtime.sh" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then - OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest - else - ./build-apisix-runtime.sh latest - fi + ./build-apisix-runtime.sh latest rm build-apisix-runtime.sh } From 93e3294f84852d76af2feb337fd5de765de73c01 Mon Sep 17 00:00:00 2001 From: Nic Date: Fri, 22 May 2026 11:25:54 +0800 Subject: [PATCH 21/22] ci: clear runtime selector for build tools --- ci/common.sh | 6 +++++- utils/install-dependencies.sh | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci/common.sh b/ci/common.sh index 30ea4a46ffad..9176369039b1 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -96,7 +96,11 @@ install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME} wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - ./build-apisix-runtime.sh latest + if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then + OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest + else + ./build-apisix-runtime.sh latest + fi } install_grpcurl () { diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh index 74c646b8fe77..0a7b6462fbd8 100755 --- a/utils/install-dependencies.sh +++ b/utils/install-dependencies.sh @@ -131,7 +131,11 @@ function install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME:?} wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - ./build-apisix-runtime.sh latest + if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then + OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest + else + ./build-apisix-runtime.sh latest + fi rm build-apisix-runtime.sh } From 01207a4d60a38ed212f620aabe08d1b5c6203455 Mon Sep 17 00:00:00 2001 From: Nic Date: Fri, 22 May 2026 12:03:51 +0800 Subject: [PATCH 22/22] ci: remove OpenResty version selector --- .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 +-- ci/common.sh | 6 +----- ci/linux-install-openresty.sh | 16 +++++++--------- ..._current_luarocks_in_customed_nginx_runner.sh | 2 -- ci/linux_openresty_runner.sh | 2 -- ci/linux_openresty_tongsuo_runner.sh | 1 - utils/install-dependencies.sh | 6 +----- 13 files changed, 15 insertions(+), 41 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db74bfb4c921..f600c983faac 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 c6a12ea2dee1..5995ae0f4b1e 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 846ea68994de..bec199a8f2a6 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 46447e41eeca..bc6360bc5f40 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 44260e0fc771..e64056e96d50 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 5487df3a6340..f78d4ed77bfe 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 3eb4c3f2da89..d0eebb921579 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/ci/common.sh b/ci/common.sh index 9176369039b1..30ea4a46ffad 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -96,11 +96,7 @@ install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME} wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then - OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest - else - ./build-apisix-runtime.sh latest - fi + ./build-apisix-runtime.sh latest } install_grpcurl () { diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh index 465df32bb694..1279cc1bc69f 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 3eaba07ec53c..c7e843e58356 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 2e39224efc59..98422873ec11 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 2afdceaf9a3d..973277300362 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 diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh index 0a7b6462fbd8..74c646b8fe77 100755 --- a/utils/install-dependencies.sh +++ b/utils/install-dependencies.sh @@ -131,11 +131,7 @@ function install_apisix_runtime() { export runtime_version=${APISIX_RUNTIME:?} wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh - if [[ "${OPENRESTY_VERSION:-}" == "default" || "${OPENRESTY_VERSION:-}" == "source" ]]; then - OPENRESTY_VERSION="" ./build-apisix-runtime.sh latest - else - ./build-apisix-runtime.sh latest - fi + ./build-apisix-runtime.sh latest rm build-apisix-runtime.sh }