Skip to content

Update libgit2 to v1.1.0 #2

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.

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 2 commits into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 10 additions & 9 deletions .github/workflows/Build_and_publish_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ on:

env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: RelWithDebInfo
BUILD_TYPE: 'RelWithDebInfo'
NUPKG_VERSION: '1.110.1'

jobs:
build:
Expand All @@ -23,23 +24,23 @@ jobs:
with:
submodules: recursive

# Build project using powershell script
- name: Build project
# Build project using powershell script
run: |
.\build.libgit2.ps1
.\mx_buildpackage.ps1 -version 1.101.10
.\mx_buildpackage.ps1 -version ${{ env.NUPKG_VERSION }}
shell: powershell
# Publish the package to github actions
# We add the github source so that we can authenticate correctly to github packages with both a username and a password

# Publish the package to github actions
# We add the github source so that we can authenticate correctly to github packages with both a username and a password
- name: Upload build artifacts
uses: actions/upload-artifact@v2
with:
name: nuget package
path: ${{ github.workspace }}/**/*.nupkg
- name: Publish package

- name: Publish package
run: |
nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/Mendix/index.json" -UserName srv-LibGit2sharp-mendix -Password ${{ secrets.GHPACKAGESTOKEN }}
nuget source Add -Name "GitHub" -Source "https://nuget.pkg.github.com/Mendix/index.json" -UserName ${{ secrets.GHPACKAGESUSER }} -Password ${{ secrets.GHPACKAGESTOKEN }}
nuget push **/*.nupkg -Source "GitHub" -SkipDuplicate
shell: powershell
2 changes: 1 addition & 1 deletion libgit2
Submodule libgit2 updated 701 files
16 changes: 8 additions & 8 deletions mx_nuget.package/MendixBinaries.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>Mendix.LibGit2Sharp.NativeBinaries</id>
<version>0.1</version>
<version>0.0.1</version>
<authors>LibGit2Sharp contributors</authors>
<owners>mendix</owners>
<licenseUrl>https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING</licenseUrl>
Expand All @@ -13,15 +13,15 @@
<description>Native binaries for LibGit2Sharp</description>
</metadata>
<files>
<file src="buildMultiTargeting/**/*.*" />
<file src="buildMultiTargeting/**/*.*" />

<file src="../nuget.package/build/LibGit2Sharp.NativeBinaries.props" target="build/Mendix.LibGit2Sharp.NativeBinaries.props" />
<file src="../nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props" target="build/net46/Mendix.LibGit2Sharp.NativeBinaries.props" />
<file src="../nuget.package/libgit2/LibGit2Sharp.dll.config" target="libgit2" />
<file src="../nuget.package/libgit2/LibGit2Sharp.dll.config" target="libgit2" />
<file src="../nuget.package/libgit2/libgit2.license.txt" target="libgit2" />
<file src="../nuget.package/libgit2/libgit2_hash.txt" target="libgit2" />
<file src="runtimes/**/*.*" />
</files>

<file src="runtimes/**/*.*" />
</files>
</package>
4 changes: 2 additions & 2 deletions nuget.package/build/LibGit2Sharp.NativeBinaries.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>0ced29612dacb67eefe0c562a5c1d3aab21cce96</libgit2_hash>
<libgit2_filename>git2-0ced296</libgit2_filename>
<libgit2_hash>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
<libgit2_filename>git2-7f4fa17</libgit2_filename>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
<libgit2_hash>0ced29612dacb67eefe0c562a5c1d3aab21cce96</libgit2_hash>
<libgit2_filename>git2-0ced296</libgit2_filename>
<libgit2_hash>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
<libgit2_filename>git2-7f4fa17</libgit2_filename>
</PropertyGroup>
<ItemGroup>
<ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
Expand Down
4 changes: 2 additions & 2 deletions nuget.package/libgit2/LibGit2Sharp.dll.config
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-0ced296" target="lib/linux-x64/libgit2-0ced296.so" />
<dllmap os="osx" cpu="x86,x86-64" dll="git2-0ced296" target="lib/osx/libgit2-0ced296.dylib" />
<dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-7f4fa17" target="lib/linux-x64/libgit2-7f4fa17.so" />
<dllmap os="osx" cpu="x86,x86-64" dll="git2-7f4fa17" target="lib/osx/libgit2-7f4fa17.dylib" />
</configuration>
2 changes: 1 addition & 1 deletion nuget.package/libgit2/libgit2_hash.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0ced29612dacb67eefe0c562a5c1d3aab21cce96
7f4fa178629d559c037a1f72f79f79af9c1ef8ce