From 3aa9bfb65508d264e6b10e5fffd93e3bd10e0b62 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 23 May 2024 16:51:23 +0200 Subject: [PATCH 1/3] Change libunwind submodule branch --- .gitmodules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index ac10c71f961..896ef173237 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,12 +23,12 @@ url = https://github.com/xamarin/xamarin-android-tools branch = main [submodule "external/xxHash"] - path = external/xxHash - url = https://github.com/Cyan4973/xxHash.git + path = external/xxHash + url = https://github.com/Cyan4973/xxHash.git [submodule "external/constexpr-xxh3"] - path = external/constexpr-xxh3 - url = https://github.com/chys87/constexpr-xxh3.git + path = external/constexpr-xxh3 + url = https://github.com/chys87/constexpr-xxh3.git [submodule "external/libunwind"] - path = external/libunwind - url = https://github.com/libunwind/libunwind.git - branch = master + path = external/libunwind + url = https://github.com/libunwind/libunwind.git + branch = v1.8-stable From 7ad45b7e1465dfce9a733ccaca9dff136e91ebbc Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 23 May 2024 12:39:07 -0400 Subject: [PATCH 2/3] sort .gitmodules entries --- .gitmodules | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 896ef173237..e948bd35a91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,10 @@ path = external/android-api-docs url = https://github.com/xamarin/android-api-docs branch = main +[submodule "external/constexpr-xxh3"] + path = external/constexpr-xxh3 + url = https://github.com/chys87/constexpr-xxh3.git + branch = main [submodule "external/debugger-libs"] path = external/debugger-libs url = https://github.com/mono/debugger-libs @@ -10,6 +14,10 @@ path = external/Java.Interop url = https://github.com/xamarin/java.interop.git branch = main +[submodule "external/libunwind"] + path = external/libunwind + url = https://github.com/libunwind/libunwind.git + branch = v1.8-stable [submodule "external/lz4"] path = external/lz4 url = https://github.com/xamarin/lz4 @@ -25,10 +33,3 @@ [submodule "external/xxHash"] path = external/xxHash url = https://github.com/Cyan4973/xxHash.git -[submodule "external/constexpr-xxh3"] - path = external/constexpr-xxh3 - url = https://github.com/chys87/constexpr-xxh3.git -[submodule "external/libunwind"] - path = external/libunwind - url = https://github.com/libunwind/libunwind.git - branch = v1.8-stable From 395d3f6e2951f8d5d8d87fc1219e858a95a70ad0 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 23 May 2024 12:42:09 -0400 Subject: [PATCH 3/3] Update .gitmodules Add branch for xxHash --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index e948bd35a91..e01e3a515fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,3 +33,4 @@ [submodule "external/xxHash"] path = external/xxHash url = https://github.com/Cyan4973/xxHash.git + branch = release