From 80dc64c075bdd9a3a88b9a678bbb06ca4a9aadbf Mon Sep 17 00:00:00 2001
From: Wangchong Zhou <fffonion@gmail.com>
Date: Thu, 17 Mar 2022 00:19:26 +0800
Subject: [PATCH] tests(github) bump version of openssl and openresty matrix

---
 .github/workflows/tests.yml | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c25fdf68..c8a7c52f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,12 +18,12 @@ jobs:
           lua_nginx_module: "v0.10.19"
           lua_resty_core: "v0.1.21"
         - nginx: "1.19.3"
-          openssl: "1.1.1l"
+          openssl: "1.1.1n"
           valgrind: "valgrind"
           lua_nginx_module: "v0.10.19"
           lua_resty_core: "v0.1.21"
         - nginx: "1.19.3"
-          openssl: "3.0.0"
+          openssl: "3.0.2"
           valgrind: "valgrind"
           openssl_opts: "enable-fips"
           lua_nginx_module: "v0.10.19"
@@ -35,49 +35,40 @@ jobs:
           lua_nginx_module: "v0.10.20"
           lua_resty_core: "v0.1.22"
         - nginx: "1.19.9"
-          openssl: "1.1.1l"
+          openssl: "1.1.1n"
           valgrind: "valgrind"
           lua_nginx_module: "v0.10.20"
           lua_resty_core: "v0.1.22"
         - nginx: "1.19.9"
-          openssl: "3.0.0"
+          openssl: "3.0.2"
           valgrind: "valgrind"
           openssl_opts: "enable-fips"
           lua_nginx_module: "v0.10.20"
           lua_resty_core: "v0.1.22"
           nginx_cc_opts: "-Wno-error"
-        # two versions older nginx with 1.0.2 and 1.1.1
-        - nginx: "1.17.8"
-          openssl: "1.0.2u"
-          lua_nginx_module: "v0.10.20"
-          lua_resty_core: "v0.1.22"
-        - nginx: "1.17.8"
-          openssl: "1.1.1l"
-          lua_nginx_module: "v0.10.20"
-          lua_resty_core: "v0.1.22"
         # latest version with EOL 1.1.0
         - nginx: "1.19.9"
           openssl: "1.1.0l"
           lua_nginx_module: "v0.10.20"
           lua_resty_core: "v0.1.22"
         # version that kong uses, for fips
-        - nginx: "1.19.3"
+        - nginx: "1.19.9"
           openssl: "1.0.2u"
           fips2: "2.0.16"
           openssl_opts: "fips --with-fipsdir=/home/runner/work/cache/ssl/fips"
           valgrind: "valgrind"
-          lua_nginx_module: "v0.10.19"
-          lua_resty_core: "v0.1.21"
-        - nginx: "1.19.3"
+          lua_nginx_module: "v0.10.20"
+          lua_resty_core: "v0.1.22"
+        - nginx: "1.19.9"
           boringssl: "ae223d6138807a13006342edfeef32e813246b39" # fips-20190808
           valgrind: "valgrind"
-          lua_nginx_module: "v0.10.19"
-          lua_resty_core: "v0.1.21"
-        - nginx: "1.19.3"
+          lua_nginx_module: "v0.10.20"
+          lua_resty_core: "v0.1.22"
+        - nginx: "1.19.9"
           boringssl: "853ca1ea1168dff08011e5d42d94609cc0ca2e27" # fips-20210429, not active yet
           valgrind: "valgrind"
-          lua_nginx_module: "v0.10.19"
-          lua_resty_core: "v0.1.21"
+          lua_nginx_module: "v0.10.20"
+          lua_resty_core: "v0.1.22"
 
     env:
       JOBS: 3