From 9abb82e950caee533c6cf9fa1807fe526cfae9db Mon Sep 17 00:00:00 2001 From: zhaozg Date: Sat, 6 Jan 2024 14:03:52 +0800 Subject: [PATCH 1/5] ci: disable make parallel execution --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c600e704..826dee91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,7 @@ jobs: env: BUILD_TYPE: ${{ matrix.build_type }} WITH_LUA_ENGINE: ${{ matrix.lua_engine }} + NPROCS: 1 steps: - uses: actions/checkout@v2 From 4ea687eab4a8358cfba902560f4b78a1d782bf9f Mon Sep 17 00:00:00 2001 From: zhaozg Date: Sat, 6 Jan 2024 12:49:01 +0800 Subject: [PATCH 2/5] bump lrexlib to rel-2-9-2 --- deps/lrexlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/lrexlib b/deps/lrexlib index 69d5c442..9aa5e7e9 160000 --- a/deps/lrexlib +++ b/deps/lrexlib @@ -1 +1 @@ -Subproject commit 69d5c442c5a4bdc1271103e88c5c798b605e9ed2 +Subproject commit 9aa5e7e9ca47da1bd0e023dfa0b1b2d43aa358f3 From 82f7cb2ca01e812f9689031281103f23e2edd1fc Mon Sep 17 00:00:00 2001 From: zhaozg Date: Sat, 6 Jan 2024 14:25:34 +0800 Subject: [PATCH 3/5] bump lua-zlib to head 15d4bc84 --- deps/lua-zlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/lua-zlib b/deps/lua-zlib index a305d98f..15d4bc84 160000 --- a/deps/lua-zlib +++ b/deps/lua-zlib @@ -1 +1 @@ -Subproject commit a305d98f473d0a253b6fd740ce60d7d5a5f1cda0 +Subproject commit 15d4bc84b0ad3e4012d72ce18cfae58518ec13b4 From 94a850504da61fde1abe58b1c06f9b67b3dbedf0 Mon Sep 17 00:00:00 2001 From: zhaozg Date: Sat, 6 Jan 2024 14:22:37 +0800 Subject: [PATCH 4/5] bump luv to v1.47.0-0 --- deps/luv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/luv b/deps/luv index 045bf29b..7c0735f4 160000 --- a/deps/luv +++ b/deps/luv @@ -1 +1 @@ -Subproject commit 045bf29b6f54f9b511f8b76088250d2a90dbdf4f +Subproject commit 7c0735f46cda5ef68c2e5c4fba8d4a7573fcf132 From 2870013df2cdaf835c16173b13f3bb1507494929 Mon Sep 17 00:00:00 2001 From: zhaozg Date: Sat, 6 Jan 2024 14:24:12 +0800 Subject: [PATCH 5/5] bump lua-openssl to v0.9.0-0 --- deps/lua-openssl | 2 +- deps/lua-openssl.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/deps/lua-openssl b/deps/lua-openssl index 48aefc2f..5bc07789 160000 --- a/deps/lua-openssl +++ b/deps/lua-openssl @@ -1 +1 @@ -Subproject commit 48aefc2f9bad8cc51686e96c66a3237832f8b101 +Subproject commit 5bc07789cbe473bc86dda1957a168fb209077c38 diff --git a/deps/lua-openssl.cmake b/deps/lua-openssl.cmake index acddbf49..a3aa4a0f 100644 --- a/deps/lua-openssl.cmake +++ b/deps/lua-openssl.cmake @@ -41,6 +41,7 @@ add_library(lua_openssl ${LUA_OPENSSL_DIR}/src/ec.c ${LUA_OPENSSL_DIR}/src/engine.c ${LUA_OPENSSL_DIR}/src/hmac.c + ${LUA_OPENSSL_DIR}/src/kdf.c ${LUA_OPENSSL_DIR}/src/lbn.c ${LUA_OPENSSL_DIR}/src/lhash.c ${LUA_OPENSSL_DIR}/src/misc.c