Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: drop support of OpenResty 1.19 #9913

Merged
merged 3 commits into from
Jul 28, 2023
Merged

chore: drop support of OpenResty 1.19 #9913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
643ab87
chore: drop support of OpenResty 1.19
AlinsRan Jul 27, 2023
14d234c
Merge branch 'apache:master' into chore/drop-openresty
AlinsRan Jul 27, 2023
ede4575
Merge branch 'apache:master' into chore/drop-openresty
AlinsRan Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]*
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/kubernetes-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- ubuntu-20.04
os_name:
- linux_openresty
- linux_openresty_1_19

runs-on: ${{ matrix.platform }}
timeout-minutes: 15
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/tars-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
- ubuntu-20.04
os_name:
- linux_openresty
- linux_openresty_1_19

runs-on: ${{ matrix.platform }}
timeout-minutes: 15
Expand Down
2 changes: 1 addition & 1 deletion apisix/cli/ops.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions ci/linux_openresty_1_19_runner.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion t/chaos/utils/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions t/kubernetes/discovery/stream/kubernetes.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
6 changes: 1 addition & 5 deletions t/tars/discovery/stream/tars.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down