Skip to content

Commit d03ea98

Browse files
committed
Experimental no-TLS version
Build a version without HTTPS support to support built-in HTTPS.
1 parent adc7785 commit d03ea98

10 files changed

+16
-29
lines changed

.travis.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,6 @@ matrix:
99
dist: trusty
1010
sudo: required
1111
env: RID=linux-x64
12-
- os: linux
13-
dist: trusty
14-
sudo: required
15-
env: RID=rhel-x64
16-
- os: linux
17-
dist: trusty
18-
sudo: required
19-
env: RID=fedora-x64
20-
- os: linux
21-
dist: trusty
22-
sudo: required
23-
env: RID=debian.9-x64
24-
- os: linux
25-
dist: trusty
26-
sudo: required
27-
env: RID=alpine-x64
2812
- os: osx
2913
env: RID=osx
3014

@@ -41,6 +25,6 @@ before_install:
4125

4226
install: true
4327

44-
script: if [[ $RID == "osx" ]]; then ./build.libgit2.sh ; else ./dockerbuild.sh ; fi
28+
script: ./build.libgit2.sh
4529

4630
after_success: ./uploadbinaries.sh

UpdateLibgit2ToSha.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<#
22
.SYNOPSIS
3-
Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.props with the new hash value.
3+
Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.NoTLS.props with the new hash value.
44
.PARAMETER sha
55
Desired libgit2 version. This is run through `git rev-parse`, so branch names are okay too.
66
#>
@@ -101,7 +101,7 @@ Push-Location $libgit2Directory
101101
</Project>
102102
"@
103103

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

106106
$net461BuildProperties = @"
107107
<Project>
@@ -160,7 +160,7 @@ Push-Location $libgit2Directory
160160
</Project>
161161
"@
162162

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

165165
$dllConfig = @"
166166
<configuration>

build.libgit2.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ cmake -DCMAKE_BUILD_TYPE:STRING=Release \
1515
-DENABLE_TRACE=ON \
1616
-DLIBGIT2_FILENAME=git2-$SHORTSHA \
1717
-DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
18+
-DUSE_HTTPS=OFF \
19+
-DCURL=OFF \
20+
-DUSE_BUNDLED_ZLIB=ON \
1821
..
1922
cmake --build .
2023

download.build.artifacts.and.package.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Push-location "$($package.FullName).ext"
149149
Remove-Item -Path ".\_rels\" -Recurse
150150
Remove-Item -Path ".\package\" -Recurse
151151
Remove-Item -Path '.\`[Content_Types`].xml'
152-
& "$root/Nuget.exe" pack "LibGit2Sharp.NativeBinaries.nuspec" -OutputDirectory "$path" -NoPackageAnalysis -Verbosity "detailed"
152+
& "$root/Nuget.exe" pack "LibGit2Sharp.NativeBinaries.NoTLS.nuspec" -OutputDirectory "$path" -NoPackageAnalysis -Verbosity "detailed"
153153

154154
$newPackage = Get-ChildItem -Path $path -Filter "*.nupkg"
155155
Pop-Location

nuget.package/NativeBinaries.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
4-
<id>LibGit2Sharp.NativeBinaries</id>
4+
<id>LibGit2Sharp.NativeBinaries.NoTLS</id>
55
<version>1.0.155</version>
66
<authors>LibGit2Sharp contributors</authors>
7-
<owners>nulltoken</owners>
7+
<owners>ethomson</owners>
88
<licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
99
<projectUrl>https://github.com/libgit2/libgit2sharp.nativebinaries</projectUrl>
1010
<iconUrl>https://raw.githubusercontent.com/libgit2/libgit2sharp/master/square-logo.png</iconUrl>
1111
<requireLicenseAcceptance>false</requireLicenseAcceptance>
12-
<description>Native binaries for LibGit2Sharp</description>
12+
<description>Native binaries for LibGit2Sharp: Experimental Builtin HTTPS Support</description>
1313
</metadata>
1414
</package>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<Import Project="..\build\LibGit2Sharp.NativeBinaries.NoTLS.props" />
3+
</Project>

nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.props

Lines changed: 0 additions & 3 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<Project>
2-
<Import Project="..\..\build\net461\LibGit2Sharp.NativeBinaries.props" />
3-
</Project>
2+
<Import Project="..\..\build\net461\LibGit2Sharp.NativeBinaries.NoTLS.props" />
3+
</Project>

0 commit comments

Comments
 (0)