This is an automated email from the ASF dual-hosted git repository.
alinsran 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 0a4cbc0df chore: drop support of OpenResty 1.19 (#9913)
0a4cbc0df is described below
commit 0a4cbc0df1a8cbbe496aa803162a884f0ce423bc
Author: Xin Rong <[email protected]>
AuthorDate: Fri Jul 28 09:16:19 2023 +0800
chore: drop support of OpenResty 1.19 (#9913)
---
.github/workflows/build.yml | 1 -
.github/workflows/kubernetes-ci.yml | 1 -
.github/workflows/tars-ci.yml | 1 -
apisix/cli/ops.lua | 2 +-
ci/linux_openresty_1_19_runner.sh | 21 ---------------------
t/chaos/utils/Dockerfile | 2 +-
t/kubernetes/discovery/stream/kubernetes.t | 6 +-----
t/tars/discovery/stream/tars.t | 6 +-----
8 files changed, 4 insertions(+), 36 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efa5b8f63..c90a8e900 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,6 @@ jobs:
- ubuntu-20.04
os_name:
- linux_openresty
- - linux_openresty_1_19
test_dir:
- t/plugin/[a-k]*
- t/plugin/[l-z]*
diff --git a/.github/workflows/kubernetes-ci.yml
b/.github/workflows/kubernetes-ci.yml
index ea72fe571..b8d33af7c 100644
--- a/.github/workflows/kubernetes-ci.yml
+++ b/.github/workflows/kubernetes-ci.yml
@@ -28,7 +28,6 @@ jobs:
- ubuntu-20.04
os_name:
- linux_openresty
- - linux_openresty_1_19
runs-on: ${{ matrix.platform }}
timeout-minutes: 15
diff --git a/.github/workflows/tars-ci.yml b/.github/workflows/tars-ci.yml
index aa4c1b6e4..a646d86ce 100644
--- a/.github/workflows/tars-ci.yml
+++ b/.github/workflows/tars-ci.yml
@@ -28,7 +28,6 @@ jobs:
- ubuntu-20.04
os_name:
- linux_openresty
- - linux_openresty_1_19
runs-on: ${{ matrix.platform }}
timeout-minutes: 15
diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
index 79b359f62..8ba08c7fa 100644
--- a/apisix/cli/ops.lua
+++ b/apisix/cli/ops.lua
@@ -258,7 +258,7 @@ Please modify "admin_key" in conf/config.yaml .
util.die("can not find openresty\n")
end
- local need_ver = "1.19.3"
+ local need_ver = "1.21.4"
if not version_greater_equal(or_ver, need_ver) then
util.die("openresty version must >=", need_ver, " current ", or_ver,
"\n")
end
diff --git a/ci/linux_openresty_1_19_runner.sh
b/ci/linux_openresty_1_19_runner.sh
deleted file mode 100755
index ed1751308..000000000
--- a/ci/linux_openresty_1_19_runner.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-export OPENRESTY_VERSION=1.19.3.2
-. ./ci/linux_openresty_common_runner.sh
diff --git a/t/chaos/utils/Dockerfile b/t/chaos/utils/Dockerfile
index 36bf2212f..9ab2a0509 100644
--- a/t/chaos/utils/Dockerfile
+++ b/t/chaos/utils/Dockerfile
@@ -17,7 +17,7 @@
ARG ENABLE_PROXY=false
-FROM openresty/openresty:1.19.3.2-alpine-fat AS production-stage
+FROM openresty/openresty:1.21.4.1-alpine-fat AS production-stage
ARG ENABLE_PROXY
ARG APISIX_PATH
diff --git a/t/kubernetes/discovery/stream/kubernetes.t
b/t/kubernetes/discovery/stream/kubernetes.t
index 3df431fb6..5d9e06c86 100644
--- a/t/kubernetes/discovery/stream/kubernetes.t
+++ b/t/kubernetes/discovery/stream/kubernetes.t
@@ -51,11 +51,7 @@ use t::APISIX;
my $nginx_binary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
my $version = eval { `$nginx_binary -V 2>&1` };
-if ($version =~ m/\/1.19.3/) {
- plan(skip_all => "require OpenResty version >= 1.19.9.1");
-} else {
- plan('no_plan');
-}
+plan('no_plan');
repeat_each(1);
log_level('warn');
diff --git a/t/tars/discovery/stream/tars.t b/t/tars/discovery/stream/tars.t
index b7c55a0f4..b67497027 100644
--- a/t/tars/discovery/stream/tars.t
+++ b/t/tars/discovery/stream/tars.t
@@ -19,11 +19,7 @@ use t::APISIX;
my $nginx_binary = $ENV{'TEST_NGINX_BINARY'} || 'nginx';
my $version = eval { `$nginx_binary -V 2>&1` };
-if ($version =~ m/\/1.19.3/) {
- plan(skip_all => "require OpenResty version >= 1.19.9.1");
-} else {
- plan('no_plan');
-}
+plan('no_plan');
repeat_each(1);
log_level('warn');
