From 991928ea75ab7456f7b2885301fc4756de1f06e5 Mon Sep 17 00:00:00 2001
From: Wangchong Zhou <fffonion@gmail.com>
Date: Wed, 24 Jul 2024 19:07:02 +0800
Subject: [PATCH 1/2] chore(ci): update openssl download link and matrices

---
 .github/workflows/tests.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 28d1cc26..fcb6694a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,21 +19,22 @@ jobs:
         include:
         # TODO: arm64
         # latest and one version older for valgrind
-        - nginx: "1.19.3"
-          openssl: "1.1.1n"
-          valgrind: "valgrind"
-          lua_nginx_module: "v0.10.19"
-          lua_resty_core: "v0.1.21"
         - nginx: "1.19.9"
-          openssl: "1.1.1n"
+          openssl: "3.2.1"
           valgrind: "valgrind"
-          lua_nginx_module: "v0.10.20"
-          lua_resty_core: "v0.1.22"
+          lua_nginx_module: "v0.10.21"
+          lua_resty_core: "v0.1.23"
         - nginx: "1.21.4"
-          openssl: "1.1.1s"
+          openssl: "3.2.1"
           valgrind: "valgrind"
           lua_nginx_module: "v0.10.21"
           lua_resty_core: "v0.1.23"
+        - nginx: "1.25.3"
+          openssl: "3.2.1"
+          valgrind: "valgrind"
+          lua_nginx_module: "v0.10.26"
+          stream_lua_nginx_module: "v0.0.14"
+          lua_resty_core: "v0.1.28"
 
     env:
       JOBS: 1 # must be 1 as LMDB tests interfere with each other
@@ -96,7 +97,7 @@ jobs:
     - name: Build OpenSSL
       run: |
         if [ "X$OPENSSL_HASH" != "X" ]; then wget https://github.com/openssl/openssl/archive/$OPENSSL_HASH.tar.gz -O - | tar zxf ; pushd openssl-$OPENSSL_HASH/; fi
-        if [ "X$OPENSSL_HASH" = "X" ] ; then wget https://www.openssl.org/source/openssl-${{ matrix.openssl }}.tar.gz -O - | tar zxf -; pushd openssl-${{ matrix.openssl }}/; fi
+        if [ "X$OPENSSL_HASH" = "X" ] ; then wget https://github.com/openssl/openssl/releases/download/openssl-${{ matrix.openssl }}/openssl-${{ matrix.openssl }}.tar.gz -O - | tar zxf -; pushd openssl-${{ matrix.openssl }}/; fi
         if [ ! -e $OPENSSL_PREFIX/include ]; then ./config shared -d --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1); fi
         if [ ! -e $OPENSSL_PREFIX/include ]; then make -j$JOBS > build.log 2>&1 || (cat build.log && exit 1); fi
         if [ ! -e $OPENSSL_PREFIX/include ]; then sudo make PATH=$PATH install_sw > build.log 2>&1 || (cat build.log && exit 1); fi

From b875e72e4a9d65da72134633e8aa42e63586d5aa Mon Sep 17 00:00:00 2001
From: Wangchong Zhou <fffonion@gmail.com>
Date: Wed, 24 Jul 2024 19:27:49 +0800
Subject: [PATCH 2/2] Update tests.yml

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fcb6694a..ff4f6940 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,7 +20,7 @@ jobs:
         # TODO: arm64
         # latest and one version older for valgrind
         - nginx: "1.19.9"
-          openssl: "3.2.1"
+          openssl: "1.1.1w"
           valgrind: "valgrind"
           lua_nginx_module: "v0.10.21"
           lua_resty_core: "v0.1.23"