Skip to content

Commit 08ad511

Browse files
catbro666pintsized
authored andcommitted
add the latest openresty versions and skip mtls tests only when nginx
version < 1.21.4
1 parent af9d005 commit 08ad511

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/test.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ jobs:
2020
openresty_version:
2121
- 1.17.8.2
2222
- 1.19.9.1
23+
- 1.21.4.3
24+
- 1.25.3.1
2325

2426
runs-on: ubuntu-latest
2527
container:
@@ -49,7 +51,9 @@ jobs:
4951
run: cpanm -q -n Test::Nginx
5052

5153
- name: Install Luacov
52-
run: /usr/local/openresty/luajit/bin/luarocks install luacov
54+
run: |
55+
/usr/local/openresty/luajit/bin/luarocks install luacov
56+
/usr/local/openresty/luajit/bin/luarocks install lua-resty-openssl
5357
5458
- uses: actions/checkout@v2
5559

t/20-mtls.t

+6-5
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ GET /t
105105

106106
=== TEST 2: Connection fails during handshake with not priv_key
107107
--- http_config eval: $::mtls_http_config
108-
--- SKIP
109108
--- config eval
110109
"
111110
lua_ssl_trusted_certificate $::HtmlDir/test.crt;
@@ -151,10 +150,10 @@ GET /t
151150
--- error_log
152151
could not set client certificate: bad client pkey type
153152
--- response_body_unlike: hello, CN=foo@example.com,O=OpenResty,ST=California,C=US
154-
153+
--- skip_nginx
154+
4: < 1.21.4
155155

156156
=== TEST 3: Connection succeeds with client cert and key. SKIP'd for CI until feature is merged.
157-
--- SKIP
158157
--- http_config eval: $::mtls_http_config
159158
--- config eval
160159
"
@@ -208,10 +207,10 @@ GET /t
208207
[warn]
209208
--- response_body
210209
hello, CN=foo@example.com,O=OpenResty,ST=California,C=US
211-
210+
--- skip_nginx
211+
4: < 1.21.4
212212

213213
=== TEST 4: users with different client certs should not share the same pool.
214-
--- SKIP
215214
--- http_config eval: $::mtls_http_config
216215
--- config eval
217216
"
@@ -307,3 +306,5 @@ hello, [email protected],O=OpenResty,ST=California,C=US
307306
true
308307
nil
309308
400
309+
--- skip_nginx
310+
4: < 1.21.4

0 commit comments

Comments
 (0)