diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c74bd63c..4659da6b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -143,7 +143,7 @@ jobs: ninja_platform: mac qt_platform: mac openssl_arch: darwin64-x86_64-cc - cmake_flags: "-DUSE_SSH=OFF" + cmake_flags: "-DUSE_SSH:STRING=localbuild" cmake_env: {} pack: 1 @@ -155,7 +155,7 @@ jobs: qt_arch_check_only: win64_msvc2017_64 openssl_arch: VC-WIN64A msvc_arch: x64 - cmake_flags: "-DUSE_SSH=OFF" + cmake_flags: "-DUSE_SSH:STRING=localbuild" cmake_env: CMAKE_RC_FLAGS: "/C 1252" CC: clang @@ -170,7 +170,7 @@ jobs: qt_arch_check_only: win32_msvc2017 openssl_arch: VC-WIN32 msvc_arch: x86 - cmake_flags: "-DUSE_SSH=OFF" + cmake_flags: "-DUSE_SSH:STRING=localbuild" cmake_env: CMAKE_RC_FLAGS: "/C 1252" CC: clang diff --git a/dep/libgit2/libgit2 b/dep/libgit2/libgit2 index d4c2f7603..7d8fceccc 160000 --- a/dep/libgit2/libgit2 +++ b/dep/libgit2/libgit2 @@ -1 +1 @@ -Subproject commit d4c2f7603e297cc972af2ec2d5bdab1cc3b825e0 +Subproject commit 7d8fceccc61c5e74a1d2d4e1ad01f807828b6568 diff --git a/dep/libgit2/rebaseGittyupLibgit2.sh b/dep/libgit2/rebaseGittyupLibgit2.sh index f57528b03..79a3cfbdd 100755 --- a/dep/libgit2/rebaseGittyupLibgit2.sh +++ b/dep/libgit2/rebaseGittyupLibgit2.sh @@ -1,4 +1,4 @@ -declare -a branches=("fetch_annotated_tags" "blame_abort" "disableRenameDetection" "checkout_deletion_notification" "diff_checkout" "fix_push_callback_issues" "disable_mmap" "context_line_accessor´" "disableRenameDetection" "hash" "callback_connect_disconnect" "libgit2_includes_public") +declare -a branches=("fetch_annotated_tags" "blame_abort" "disableRenameDetection" "checkout_deletion_notification" "diff_checkout" "fix_push_callback_issues" "disable_mmap" "context_line_accessor´" "disableRenameDetection" "hash" "callback_connect_disconnect" "libgit2_includes_public", "local_libssh2") cd libgit2