diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83f95be3..131724bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: name: linux-musl-arm64 - os: ubuntu-20.04 name: linux-arm - - os: macos-10.15 + - os: macos-11 name: osx-x64 - os: macos-11 name: osx-arm64 diff --git a/Dockerfile.linux b/Dockerfile.linux index 25bf7368..4421da3d 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -1,4 +1,4 @@ -FROM multiarch/crossbuild +FROM bording/crossbuild ARG ARCH='amd64' ENV CROSS_TRIPLE=${ARCH} RUN apt update && apt -y install pkg-config diff --git a/Dockerfile.linux-musl b/Dockerfile.linux-musl index a3620994..1cfa1e4e 100644 --- a/Dockerfile.linux-musl +++ b/Dockerfile.linux-musl @@ -1,5 +1,5 @@ ARG ARCH='amd64' -FROM multiarch/alpine:${ARCH}-v3.12 +FROM multiarch/alpine:${ARCH}-v3.13 RUN apk add --no-cache bash build-base cmake WORKDIR /nativebinaries diff --git a/build.libgit2.ps1 b/build.libgit2.ps1 index d9e6403f..1e68b017 100644 --- a/build.libgit2.ps1 +++ b/build.libgit2.ps1 @@ -118,7 +118,7 @@ try { if ($x86.IsPresent) { Write-Output "Building x86..." - Run-Command -Fatal { & $cmake -A Win32 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" .. } + Run-Command -Fatal { & $cmake -A Win32 -D USE_SSH=OFF -D USE_HTTPS=Schannel -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" .. } Run-Command -Fatal { & $cmake --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration @@ -134,7 +134,7 @@ try { Write-Output "Building x64..." Run-Command -Quiet { & mkdir build64 } cd build64 - Run-Command -Fatal { & $cmake -A x64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } + Run-Command -Fatal { & $cmake -A x64 -D USE_SSH=OFF -D USE_HTTPS=Schannel -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } Run-Command -Fatal { & $cmake --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration @@ -149,7 +149,7 @@ try { Write-Output "Building arm64..." Run-Command -Quiet { & mkdir buildarm64 } cd buildarm64 - Run-Command -Fatal { & $cmake -A ARM64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } + Run-Command -Fatal { & $cmake -A ARM64 -D USE_SSH=OFF -D USE_HTTPS=Schannel -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } Run-Command -Fatal { & $cmake --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration diff --git a/libgit2 b/libgit2 index e6325351..a2bde637 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit e6325351ceee58cf56f58bdce61b38907805544f +Subproject commit a2bde63741977ca0f4ef7db2f609df320be67a08 diff --git a/nuget.exe b/nuget.exe index d70c80b7..70909263 100644 Binary files a/nuget.exe and b/nuget.exe differ diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props index 2ebcb0cb..34b29daa 100644 --- a/nuget.package/build/LibGit2Sharp.NativeBinaries.props +++ b/nuget.package/build/LibGit2Sharp.NativeBinaries.props @@ -1,7 +1,7 @@ - + $(MSBuildThisFileFullPath) - e6325351ceee58cf56f58bdce61b38907805544f - git2-e632535 + a2bde63741977ca0f4ef7db2f609df320be67a08 + git2-a2bde63 diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props index b5b988cf..b253f80c 100644 --- a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props +++ b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props @@ -1,8 +1,8 @@ - + $(MSBuildThisFileFullPath) - e6325351ceee58cf56f58bdce61b38907805544f - git2-e632535 + a2bde63741977ca0f4ef7db2f609df320be67a08 + git2-a2bde63 diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config index 68811a47..fe8e43eb 100644 --- a/nuget.package/libgit2/LibGit2Sharp.dll.config +++ b/nuget.package/libgit2/LibGit2Sharp.dll.config @@ -1,7 +1,7 @@ - - - - - - + + + + + + diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt index afbec213..f10184f2 100644 --- a/nuget.package/libgit2/libgit2_hash.txt +++ b/nuget.package/libgit2/libgit2_hash.txt @@ -1 +1 @@ -e6325351ceee58cf56f58bdce61b38907805544f +a2bde63741977ca0f4ef7db2f609df320be67a08