Skip to content

Commit 9deb8d8

Browse files
bordingbording
authored
Merge pull request libgit2#152 from libgit2/libgit2-171
Update libgit2 to v1.7.1
2 parents 827d4be + 38737e9 commit 9deb8d8

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
name: linux-musl-arm64
3838
- os: ubuntu-20.04
3939
name: linux-arm
40-
- os: macos-10.15
40+
- os: macos-11
4141
name: osx-x64
4242
- os: macos-11
4343
name: osx-arm64

‎Dockerfile.linux‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM multiarch/crossbuild
1+
FROM bording/crossbuild
22
ARG ARCH='amd64'
33
ENV CROSS_TRIPLE=${ARCH}
44
RUN apt update && apt -y install pkg-config

‎Dockerfile.linux-musl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ARCH='amd64'
2-
FROM multiarch/alpine:${ARCH}-v3.12
2+
FROM multiarch/alpine:${ARCH}-v3.13
33
RUN apk add --no-cache bash build-base cmake
44

55
WORKDIR /nativebinaries

‎build.libgit2.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ try {
118118

119119
if ($x86.IsPresent) {
120120
Write-Output "Building x86..."
121-
Run-Command -Fatal { & $cmake -A Win32 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" .. }
121+
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" .. }
122122
Run-Command -Fatal { & $cmake --build . --config $configuration }
123123
if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
124124
cd $configuration
@@ -134,7 +134,7 @@ try {
134134
Write-Output "Building x64..."
135135
Run-Command -Quiet { & mkdir build64 }
136136
cd build64
137-
Run-Command -Fatal { & $cmake -A x64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
137+
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" ../.. }
138138
Run-Command -Fatal { & $cmake --build . --config $configuration }
139139
if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
140140
cd $configuration
@@ -149,7 +149,7 @@ try {
149149
Write-Output "Building arm64..."
150150
Run-Command -Quiet { & mkdir buildarm64 }
151151
cd buildarm64
152-
Run-Command -Fatal { & $cmake -A ARM64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
152+
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" ../.. }
153153
Run-Command -Fatal { & $cmake --build . --config $configuration }
154154
if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
155155
cd $configuration

‎libgit2‎

Submodule libgit2 updated 360 files

‎nuget.exe‎

1.04 MB
Binary file not shown.

‎nuget.package/build/LibGit2Sharp.NativeBinaries.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
4-
<libgit2_hash>e6325351ceee58cf56f58bdce61b38907805544f</libgit2_hash>
5-
<libgit2_filename>git2-e632535</libgit2_filename>
4+
<libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
5+
<libgit2_filename>git2-a2bde63</libgit2_filename>
66
</PropertyGroup>
77
</Project>

‎nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
4-
<libgit2_hash>e6325351ceee58cf56f58bdce61b38907805544f</libgit2_hash>
5-
<libgit2_filename>git2-e632535</libgit2_filename>
4+
<libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
5+
<libgit2_filename>git2-a2bde63</libgit2_filename>
66
</PropertyGroup>
77
<ItemGroup>
88
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />

‎nuget.package/libgit2/LibGit2Sharp.dll.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<configuration>
2-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-e632535" target="lib/linux-x64/libgit2-e632535.so" />
3-
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-e632535" target="lib/linux-arm/libgit2-e632535.so" />
4-
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-e632535" target="lib/linux-arm64/libgit2-e632535.so" />
5-
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-e632535" target="lib/osx-x64/libgit2-e632535.dylib" />
6-
<dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-e632535" target="lib/osx-arm64/libgit2-e632535.dylib" />
1+
<configuration>
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-a2bde63" target="lib/linux-x64/libgit2-a2bde63.so" />
3+
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-a2bde63" target="lib/linux-arm/libgit2-a2bde63.so" />
4+
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-a2bde63" target="lib/linux-arm64/libgit2-a2bde63.so" />
5+
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-a2bde63" target="lib/osx-x64/libgit2-a2bde63.dylib" />
6+
<dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-a2bde63" target="lib/osx-arm64/libgit2-a2bde63.dylib" />
77
</configuration>

‎nuget.package/libgit2/libgit2_hash.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e6325351ceee58cf56f58bdce61b38907805544f
1+
a2bde63741977ca0f4ef7db2f609df320be67a08

0 commit comments

Comments
 (0)