Skip to content

Update libgit2 to v1.7.1 #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 27, 2023
Merged

Update libgit2 to v1.7.1 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fe05131
Update libgit2 to v1.7.1
bording Nov 3, 2023
75b41b1
Update crossbuild image to use Debian 10 (buster)
bording Nov 3, 2023
0853cb5
Bump Alpine version
bording Nov 4, 2023
d6fb130
Update mac image version
bording Nov 4, 2023
aa94d25
Update nuget.exe to 6.8.0
bording Nov 24, 2023
38737e9
Use Schannel for Windows HTTP
bording Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.libgit2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion libgit2
Open in desktop
Submodule libgit2 updated 360 files
Binary file modified nuget.exe
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions nuget.package/build/LibGit2Sharp.NativeBinaries.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>e6325351ceee58cf56f58bdce61b38907805544f</libgit2_hash>
<libgit2_filename>git2-e632535</libgit2_filename>
<libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
<libgit2_filename>git2-a2bde63</libgit2_filename>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>e6325351ceee58cf56f58bdce61b38907805544f</libgit2_hash>
<libgit2_filename>git2-e632535</libgit2_filename>
<libgit2_hash>a2bde63741977ca0f4ef7db2f609df320be67a08</libgit2_hash>
<libgit2_filename>git2-a2bde63</libgit2_filename>
</PropertyGroup>
<ItemGroup>
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
Expand Down
12 changes: 6 additions & 6 deletions nuget.package/libgit2/LibGit2Sharp.dll.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<configuration>
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-e632535" target="lib/linux-x64/libgit2-e632535.so" />
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-e632535" target="lib/linux-arm/libgit2-e632535.so" />
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-e632535" target="lib/linux-arm64/libgit2-e632535.so" />
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-e632535" target="lib/osx-x64/libgit2-e632535.dylib" />
<dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-e632535" target="lib/osx-arm64/libgit2-e632535.dylib" />
<configuration>
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-a2bde63" target="lib/linux-x64/libgit2-a2bde63.so" />
<dllmap os="linux" cpu="arm" wordsize="32" dll="git2-a2bde63" target="lib/linux-arm/libgit2-a2bde63.so" />
<dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-a2bde63" target="lib/linux-arm64/libgit2-a2bde63.so" />
<dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-a2bde63" target="lib/osx-x64/libgit2-a2bde63.dylib" />
<dllmap os="osx" cpu="armv8" wordsize="64" dll="git2-a2bde63" target="lib/osx-arm64/libgit2-a2bde63.dylib" />
</configuration>
2 changes: 1 addition & 1 deletion nuget.package/libgit2/libgit2_hash.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e6325351ceee58cf56f58bdce61b38907805544f
a2bde63741977ca0f4ef7db2f609df320be67a08