Skip to content
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

WIP: Experimental no-TLS version #77

Closed
wants to merge 2 commits into from
Closed

WIP: Experimental no-TLS version #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3071305
Experimental no-TLS version
ethomson Oct 7, 2018
6092bcd
Update libgit2 to 5851981
ethomson Nov 6, 2018
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
22 changes: 1 addition & 21 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,6 @@ matrix:
dist: trusty
sudo: required
env: RID=linux-x64
- os: linux
dist: trusty
sudo: required
env: RID=ubuntu.18.04-x64
- os: linux
dist: trusty
sudo: required
env: RID=rhel-x64
- os: linux
dist: trusty
sudo: required
env: RID=fedora-x64
- os: linux
dist: trusty
sudo: required
env: RID=debian.9-x64
- os: linux
dist: trusty
sudo: required
env: RID=alpine-x64
- os: osx
env: RID=osx

Expand All @@ -45,6 +25,6 @@ before_install:

install: true

script: if [[ $RID == "osx" ]]; then ./build.libgit2.sh ; else ./dockerbuild.sh ; fi
script: ./build.libgit2.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this is a temporary change? I would think we'd want to keep building things in docker to be able to better control things?

Also, we'll likely need to keep the alpine build (with tweaks to the RID) because of needing musl libc binary as well.


after_success: ./uploadbinaries.sh
6 changes: 3 additions & 3 deletions UpdateLibgit2ToSha.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#
.SYNOPSIS
Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.props with the new hash value.
Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.NoTLS.props with the new hash value.
.PARAMETER sha
Desired libgit2 version. This is run through `git rev-parse`, so branch names are okay too.
#>
Expand Down Expand Up @@ -101,7 +101,7 @@ Push-Location $libgit2Directory
</Project>
"@

Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\LibGit2Sharp.NativeBinaries.props") $buildProperties
Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\LibGit2Sharp.NativeBinaries.NoTLS.props") $buildProperties

$net461BuildProperties = @"
<Project>
Expand Down Expand Up @@ -164,7 +164,7 @@ Push-Location $libgit2Directory
</Project>
"@

Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\net461\LibGit2Sharp.NativeBinaries.props") $net461BuildProperties
Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\net461\LibGit2Sharp.NativeBinaries.NoTLS.props") $net461BuildProperties

$dllConfig = @"
<configuration>
Expand Down
3 changes: 3 additions & 0 deletions build.libgit2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ cmake -DCMAKE_BUILD_TYPE:STRING=Release \
-DENABLE_TRACE=ON \
-DLIBGIT2_FILENAME=git2-$SHORTSHA \
-DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
-DUSE_HTTPS=OFF \
-DCURL=OFF \
-DUSE_BUNDLED_ZLIB=ON \
..
cmake --build .

Expand Down
2 changes: 1 addition & 1 deletion download.build.artifacts.and.package.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Push-location "$($package.FullName).ext"
Remove-Item -Path ".\_rels\" -Recurse
Remove-Item -Path ".\package\" -Recurse
Remove-Item -Path '.\`[Content_Types`].xml'
& "$root/Nuget.exe" pack "LibGit2Sharp.NativeBinaries.nuspec" -OutputDirectory "$path" -NoPackageAnalysis -Verbosity "detailed"
& "$root/Nuget.exe" pack "LibGit2Sharp.NativeBinaries.NoTLS.nuspec" -OutputDirectory "$path" -NoPackageAnalysis -Verbosity "detailed"

$newPackage = Get-ChildItem -Path $path -Filter "*.nupkg"
Pop-Location
Expand Down
2 changes: 1 addition & 1 deletion libgit2
Open in desktop
Submodule libgit2 updated 6 files
+8 −2 include/git2/sys/transport.h
+3 −0 include/git2/types.h
+10 −3 src/transports/http.c
+10 −0 src/transports/smart.c
+10 −2 src/transports/ssh.c
+7 −1 src/transports/winhttp.c
6 changes: 3 additions & 3 deletions nuget.package/NativeBinaries.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>LibGit2Sharp.NativeBinaries</id>
<id>LibGit2Sharp.NativeBinaries.NoTLS</id>
<version>1.0.155</version>
<authors>LibGit2Sharp contributors</authors>
<owners>nulltoken</owners>
<owners>ethomson</owners>
<licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
<projectUrl>https://github.com/libgit2/libgit2sharp.nativebinaries</projectUrl>
<iconUrl>https://raw.githubusercontent.com/libgit2/libgit2sharp/master/square-logo.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Native binaries for LibGit2Sharp</description>
<description>Native binaries for LibGit2Sharp: Experimental Builtin HTTPS Support</description>
</metadata>
</package>
4 changes: 2 additions & 2 deletions ...e/build/LibGit2Sharp.NativeBinaries.props → ...d/LibGit2Sharp.NativeBinaries.NoTLS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>f23dc5b29f1394928a940d7ec447f4bfd53dad1f</libgit2_hash>
<libgit2_filename>git2-f23dc5b</libgit2_filename>
<libgit2_hash>585198165bdc4557305eed56c9e31b9655c13a02</libgit2_hash>
<libgit2_filename>git2-5851981</libgit2_filename>
</PropertyGroup>
</Project>
48 changes: 24 additions & 24 deletions .../net461/LibGit2Sharp.NativeBinaries.props → ...1/LibGit2Sharp.NativeBinaries.NoTLS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,52 @@
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>f23dc5b29f1394928a940d7ec447f4bfd53dad1f</libgit2_hash>
<libgit2_filename>git2-f23dc5b</libgit2_filename>
<libgit2_hash>585198165bdc4557305eed56c9e31b9655c13a02</libgit2_hash>
<libgit2_filename>git2-5851981</libgit2_filename>
</PropertyGroup>
<ItemGroup>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-f23dc5b.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-f23dc5b.dll">
<TargetPath>lib\win32\x64\git2-f23dc5b.dll</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-5851981.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-5851981.dll">
<TargetPath>lib\win32\x64\git2-5851981.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-f23dc5b.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-f23dc5b.pdb">
<TargetPath>lib\win32\x64\git2-f23dc5b.pdb</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-5851981.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x64\native\git2-5851981.pdb">
<TargetPath>lib\win32\x64\git2-5851981.pdb</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-f23dc5b.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-f23dc5b.dll">
<TargetPath>lib\win32\x86\git2-f23dc5b.dll</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-5851981.dll')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-5851981.dll">
<TargetPath>lib\win32\x86\git2-5851981.dll</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-f23dc5b.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-f23dc5b.pdb">
<TargetPath>lib\win32\x86\git2-f23dc5b.pdb</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-5851981.pdb')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\git2-5851981.pdb">
<TargetPath>lib\win32\x86\git2-5851981.pdb</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\libgit2-f23dc5b.dylib')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\libgit2-f23dc5b.dylib">
<TargetPath>lib\osx\libgit2-f23dc5b.dylib</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\libgit2-5851981.dylib')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\osx\native\libgit2-5851981.dylib">
<TargetPath>lib\osx\libgit2-5851981.dylib</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-f23dc5b.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-f23dc5b.so">
<TargetPath>lib\linux-x64\libgit2-f23dc5b.so</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-5851981.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\linux-x64\native\libgit2-5851981.so">
<TargetPath>lib\linux-x64\libgit2-5851981.so</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu.18.04-x64\native\libgit2-f23dc5b.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu.18.04-x64\native\libgit2-f23dc5b.so">
<TargetPath>lib\ubuntu.18.04-x64\libgit2-f23dc5b.so</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu.18.04-x64\native\libgit2-5851981.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\ubuntu.18.04-x64\native\libgit2-5851981.so">
<TargetPath>lib\ubuntu.18.04-x64\libgit2-5851981.so</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\libgit2-f23dc5b.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\libgit2-f23dc5b.so">
<TargetPath>lib\rhel-x64\libgit2-f23dc5b.so</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\libgit2-5851981.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\rhel-x64\native\libgit2-5851981.so">
<TargetPath>lib\rhel-x64\libgit2-5851981.so</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\libgit2-f23dc5b.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\libgit2-f23dc5b.so">
<TargetPath>lib\fedora-x64\libgit2-f23dc5b.so</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\libgit2-5851981.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\fedora-x64\native\libgit2-5851981.so">
<TargetPath>lib\fedora-x64\libgit2-5851981.so</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\libgit2-f23dc5b.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\libgit2-f23dc5b.so">
<TargetPath>lib\debian.9-x64\libgit2-f23dc5b.so</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\libgit2-5851981.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\debian.9-x64\native\libgit2-5851981.so">
<TargetPath>lib\debian.9-x64\libgit2-5851981.so</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\alpine-x64\native\libgit2-f23dc5b.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\alpine-x64\native\libgit2-f23dc5b.so">
<TargetPath>lib\alpine-x64\libgit2-f23dc5b.so</TargetPath>
<ContentWithTargetPath Condition="Exists('$(MSBuildThisFileDirectory)\..\..\runtimes\alpine-x64\native\libgit2-5851981.so')" Include="$(MSBuildThisFileDirectory)\..\..\runtimes\alpine-x64\native\libgit2-5851981.so">
<TargetPath>lib\alpine-x64\libgit2-5851981.so</TargetPath>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</ContentWithTargetPath>
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\libgit2\LibGit2Sharp.dll.config">
Expand Down
3 changes: 3 additions & 0 deletions nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.NoTLS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project>
<Import Project="..\build\LibGit2Sharp.NativeBinaries.NoTLS.props" />
</Project>
3 changes: 0 additions & 3 deletions nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.props
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .../net461/LibGit2Sharp.NativeBinaries.props → ...1/LibGit2Sharp.NativeBinaries.NoTLS.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project>
<Import Project="..\..\build\net461\LibGit2Sharp.NativeBinaries.props" />
</Project>
<Import Project="..\..\build\net461\LibGit2Sharp.NativeBinaries.NoTLS.props" />
</Project>
4 changes: 2 additions & 2 deletions nuget.package/libgit2/LibGit2Sharp.dll.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<configuration>
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-f23dc5b" target="lib/linux-x64/libgit2-f23dc5b.so" />
<dllmap os="osx" cpu="x86,x86-64" dll="git2-f23dc5b" target="lib/osx/libgit2-f23dc5b.dylib" />
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-5851981" target="lib/linux-x64/libgit2-5851981.so" />
<dllmap os="osx" cpu="x86,x86-64" dll="git2-5851981" target="lib/osx/libgit2-5851981.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 @@
f23dc5b29f1394928a940d7ec447f4bfd53dad1f
585198165bdc4557305eed56c9e31b9655c13a02