From 5c6c225141d7a93290304ce153d488f8ecd8b095 Mon Sep 17 00:00:00 2001 From: Tim Caswell Date: Wed, 21 Feb 2024 12:51:06 +0000 Subject: [PATCH 1/4] Annotate .gitmodules with branch and tag --- .gitmodules | 6 ++++++ deps/lua | 2 +- deps/lua-compat-5.3 | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bcfbb69e..371c46b3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,18 @@ [submodule "libuv"] path = deps/libuv url = https://github.com/libuv/libuv.git + branch = v1.x + tag = v1.48.0 [submodule "luajit"] path = deps/luajit url = https://github.com/LuaJIT/LuaJIT.git + branch = v2.1 [submodule "lua"] path = deps/lua url = https://github.com/lua/lua + branch = v5.4 [submodule "lua-compat-5.3"] path = deps/lua-compat-5.3 url = https://github.com/keplerproject/lua-compat-5.3.git + branch = master + tag = v0.12 diff --git a/deps/lua b/deps/lua index 64431851..e288c5a9 160000 --- a/deps/lua +++ b/deps/lua @@ -1 +1 @@ -Subproject commit 6443185167c77adcc8552a3fee7edab7895db1a9 +Subproject commit e288c5a91883793d14ed9e9d93464f6ee0b08915 diff --git a/deps/lua-compat-5.3 b/deps/lua-compat-5.3 index 8f8e4c6a..8c7017ec 160000 --- a/deps/lua-compat-5.3 +++ b/deps/lua-compat-5.3 @@ -1 +1 @@ -Subproject commit 8f8e4c6adb43e107f5902e784ef207dc3c8ca06b +Subproject commit 8c7017ec6f49e1768490643647a4fa06461d02b6 From 645449a16edb6de3a4e15afd86f26122f80a79ff Mon Sep 17 00:00:00 2001 From: Tim Caswell Date: Wed, 21 Feb 2024 12:55:50 +0000 Subject: [PATCH 2/4] Undo update to lua-compat submodules --- deps/lua-compat-5.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/lua-compat-5.3 b/deps/lua-compat-5.3 index 8c7017ec..8f8e4c6a 160000 --- a/deps/lua-compat-5.3 +++ b/deps/lua-compat-5.3 @@ -1 +1 @@ -Subproject commit 8c7017ec6f49e1768490643647a4fa06461d02b6 +Subproject commit 8f8e4c6adb43e107f5902e784ef207dc3c8ca06b From 27ca5e1ce760907fcbea028d4aacc6f2d07037d6 Mon Sep 17 00:00:00 2001 From: Tim Caswell Date: Wed, 21 Feb 2024 12:58:00 +0000 Subject: [PATCH 3/4] Update lua to latest tag --- .gitmodules | 4 ++-- deps/lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 371c46b3..616f9975 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,9 @@ [submodule "lua"] path = deps/lua url = https://github.com/lua/lua - branch = v5.4 + branch = master + tag = v5.4.6 [submodule "lua-compat-5.3"] path = deps/lua-compat-5.3 url = https://github.com/keplerproject/lua-compat-5.3.git branch = master - tag = v0.12 diff --git a/deps/lua b/deps/lua index e288c5a9..64431851 160000 --- a/deps/lua +++ b/deps/lua @@ -1 +1 @@ -Subproject commit e288c5a91883793d14ed9e9d93464f6ee0b08915 +Subproject commit 6443185167c77adcc8552a3fee7edab7895db1a9 From c8db95b5ff20dfd67b92f16f0499233e821d4363 Mon Sep 17 00:00:00 2001 From: Tim Caswell Date: Wed, 21 Feb 2024 13:00:07 +0000 Subject: [PATCH 4/4] Don't add tag for now --- .gitmodules | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 616f9975..e64a2201 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,6 @@ path = deps/libuv url = https://github.com/libuv/libuv.git branch = v1.x - tag = v1.48.0 [submodule "luajit"] path = deps/luajit url = https://github.com/LuaJIT/LuaJIT.git @@ -10,8 +9,7 @@ [submodule "lua"] path = deps/lua url = https://github.com/lua/lua - branch = master - tag = v5.4.6 + branch = v5.4 [submodule "lua-compat-5.3"] path = deps/lua-compat-5.3 url = https://github.com/keplerproject/lua-compat-5.3.git