Skip to content

Commit 7e25ab5

Browse files
author
A-Ovchinnikov-mx
authored
Update libgit2 to v1.1.0 (#2)
* Update libgit2 to v1.1.0 * Update NuGet package version
1 parent 40953e9 commit 7e25ab5

File tree

7 files changed

+26
-25
lines changed

7 files changed

+26
-25
lines changed

.github/workflows/Build_and_publish_package.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77

88
env:
99
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
10-
BUILD_TYPE: RelWithDebInfo
10+
BUILD_TYPE: 'RelWithDebInfo'
11+
NUPKG_VERSION: '1.110.1'
1112

1213
jobs:
1314
build:
@@ -23,23 +24,23 @@ jobs:
2324
with:
2425
submodules: recursive
2526

27+
# Build project using powershell script
2628
- name: Build project
27-
# Build project using powershell script
2829
run: |
2930
.\build.libgit2.ps1
30-
.\mx_buildpackage.ps1 -version 1.101.10
31+
.\mx_buildpackage.ps1 -version ${{ env.NUPKG_VERSION }}
3132
shell: powershell
32-
# Publish the package to github actions
33-
# We add the github source so that we can authenticate correctly to github packages with both a username and a password
34-
33+
34+
# Publish the package to github actions
35+
# We add the github source so that we can authenticate correctly to github packages with both a username and a password
3536
- name: Upload build artifacts
3637
uses: actions/upload-artifact@v2
3738
with:
3839
name: nuget package
3940
path: ${{ github.workspace }}/**/*.nupkg
40-
41-
- name: Publish package
41+
42+
- name: Publish package
4243
run: |
43-
nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/Mendix/index.json" -UserName srv-LibGit2sharp-mendix -Password ${{ secrets.GHPACKAGESTOKEN }}
44+
nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/Mendix/index.json" -UserName ${{ secrets.GHPACKAGESUSER }} -Password ${{ secrets.GHPACKAGESTOKEN }}
4445
nuget push **/*.nupkg -Source "GitHub" -SkipDuplicate
4546
shell: powershell

libgit2

Submodule libgit2 updated 701 files

mx_nuget.package/MendixBinaries.nuspec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>Mendix.LibGit2Sharp.NativeBinaries</id>
5-
<version>0.1</version>
5+
<version>0.0.1</version>
66
<authors>LibGit2Sharp contributors</authors>
77
<owners>mendix</owners>
88
<licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
@@ -13,15 +13,15 @@
1313
<description>Native binaries for LibGit2Sharp</description>
1414
</metadata>
1515
<files>
16-
<file src="buildMultiTargeting/**/*.*" />
17-
16+
<file src="buildMultiTargeting/**/*.*" />
17+
1818
<file src="../nuget.package/build/LibGit2Sharp.NativeBinaries.props" target="build/Mendix.LibGit2Sharp.NativeBinaries.props" />
1919
<file src="../nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props" target="build/net46/Mendix.LibGit2Sharp.NativeBinaries.props" />
20-
21-
<file src="../nuget.package/libgit2/LibGit2Sharp.dll.config" target="libgit2" />
20+
21+
<file src="../nuget.package/libgit2/LibGit2Sharp.dll.config" target="libgit2" />
2222
<file src="../nuget.package/libgit2/libgit2.license.txt" target="libgit2" />
2323
<file src="../nuget.package/libgit2/libgit2_hash.txt" target="libgit2" />
24-
25-
<file src="runtimes/**/*.*" />
26-
</files>
24+
25+
<file src="runtimes/**/*.*" />
26+
</files>
2727
</package>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
4-
<libgit2_hash>0ced29612dacb67eefe0c562a5c1d3aab21cce96</libgit2_hash>
5-
<libgit2_filename>git2-0ced296</libgit2_filename>
4+
<libgit2_hash>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
5+
<libgit2_filename>git2-7f4fa17</libgit2_filename>
66
</PropertyGroup>
77
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
4-
<libgit2_hash>0ced29612dacb67eefe0c562a5c1d3aab21cce96</libgit2_hash>
5-
<libgit2_filename>git2-0ced296</libgit2_filename>
4+
<libgit2_hash>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
5+
<libgit2_filename>git2-7f4fa17</libgit2_filename>
66
</PropertyGroup>
77
<ItemGroup>
88
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<configuration>
2-
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-0ced296" target="lib/linux-x64/libgit2-0ced296.so" />
3-
<dllmap os="osx" cpu="x86,x86-64" dll="git2-0ced296" target="lib/osx/libgit2-0ced296.dylib" />
2+
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-7f4fa17" target="lib/linux-x64/libgit2-7f4fa17.so" />
3+
<dllmap os="osx" cpu="x86,x86-64" dll="git2-7f4fa17" target="lib/osx/libgit2-7f4fa17.dylib" />
44
</configuration>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0ced29612dacb67eefe0c562a5c1d3aab21cce96
1+
7f4fa178629d559c037a1f72f79f79af9c1ef8ce

0 commit comments

Comments
 (0)