From 40eb0c9b193d43ff25420640af1c3601b02d6847 Mon Sep 17 00:00:00 2001 From: AlinsRan Date: Wed, 27 Dec 2023 11:21:16 +0800 Subject: [PATCH] chore: update apisix-runtime version (#10713) --- .requirements | 2 +- ci/centos7-ci.sh | 7 ++----- ci/linux-install-openresty.sh | 4 +--- ci/redhat-ci.sh | 7 ++----- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.requirements b/.requirements index 3155762a7d50..4961133ca614 100644 --- a/.requirements +++ b/.requirements @@ -17,4 +17,4 @@ APISIX_PACKAGE_NAME=apisix -APISIX_RUNTIME=1.0.1 +APISIX_RUNTIME=1.0.2 diff --git a/ci/centos7-ci.sh b/ci/centos7-ci.sh index 3bb9ed22373c..d89ce763c89f 100755 --- a/ci/centos7-ci.sh +++ b/ci/centos7-ci.sh @@ -41,11 +41,8 @@ install_dependencies() { # install openresty to make apisix's rpm test work yum install -y yum-utils && yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo - # TODO: disabled temporarily, waiting for APISIX 3.8 to be released to synchronize the apisix-runtime version - #wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime-debug-centos7.sh" - #wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-runtime-debug-centos7.sh" - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-runtime.sh" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime-debug-centos7.sh" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime-debug-centos7.sh chmod +x build-apisix-runtime.sh ./build-apisix-runtime-debug-centos7.sh diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh index 36ca62089b82..7d3ce17e6610 100755 --- a/ci/linux-install-openresty.sh +++ b/ci/linux-install-openresty.sh @@ -80,9 +80,7 @@ if [ "$OPENRESTY_VERSION" == "source" ]; then fi fi -# TODO: disabled temporarily, waiting for APISIX 3.8 to be released to synchronize the apisix-runtime version -#wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" -wget "https://raw.githubusercontent.com/api7/apisix-build-tools/master/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 ./build-apisix-runtime.sh latest diff --git a/ci/redhat-ci.sh b/ci/redhat-ci.sh index f2903bd2c597..035fe40f4792 100755 --- a/ci/redhat-ci.sh +++ b/ci/redhat-ci.sh @@ -37,11 +37,8 @@ install_dependencies() { yum install -y openresty-openssl111 openresty-openssl111-devel pcre pcre pcre-devel xz yum -y install https://repos.apiseven.com/packages/centos/apache-apisix-repo-1.0-1.noarch.rpm - # TODO: disabled temporarily, waiting for APISIX 3.8 to be released to synchronize the apisix-runtime version - #wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime-debug-centos7.sh" - #wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-runtime-debug-centos7.sh" - wget "https://raw.githubusercontent.com/api7/apisix-build-tools/master/build-apisix-runtime.sh" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime-debug-centos7.sh" + wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh" chmod +x build-apisix-runtime.sh chmod +x build-apisix-runtime-debug-centos7.sh ./build-apisix-runtime-debug-centos7.sh