Merge commit '3595b0c77a740fb46515463720e7abb42d3f14c4' into dev

This commit is contained in:
Théophile Diot 2024-01-12 13:56:08 +00:00
commit 4bf4080f9d
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
2 changed files with 4 additions and 4 deletions

View file

@ -102,9 +102,9 @@
},
{
"id": "lua-resty-core",
"name": "lua-resty-core v0.1.28",
"name": "lua-resty-core v0.1.27",
"url": "https://github.com/openresty/lua-resty-core.git",
"commit": "812b2d3871eb0d8da8f0198759ad9164f0eccac6"
"commit": "31fae862a1ed64033591f991fadb0dd80358ba0b"
},
{
"id": "lua-resty-dns",

View file

@ -52,8 +52,8 @@ do
post="yes"
else
echo "⚠️ Skipping clone of $url because target directory is already present"
echo " Updating ${name} from $url at commit/version $commit"
do_and_check_cmd git subtree pull --prefix "src/deps/src/$id" "$url" "$commit" --squash
# echo " Updating ${name} from $url at commit/version $commit"
# do_and_check_cmd git subtree pull --prefix "src/deps/src/$id" "$url" "$commit" --squash
fi
if [ -d "src/deps/src/$id/.git" ] ; then