diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b31288ec..83f95be3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: fail-fast: false steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3.5.0 with: submodules: true - name: Build Windows @@ -60,7 +60,7 @@ jobs: if: runner.os == 'Linux' run: ./dockerbuild.sh - name: Upload artifacts - uses: actions/upload-artifact@v2.2.2 + uses: actions/upload-artifact@v3.1.2 with: name: ${{ matrix.name }} path: nuget.package/runtimes/${{ matrix.name }} @@ -72,26 +72,26 @@ jobs: DOTNET_NOLOGO: true steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v3.5.0 with: fetch-depth: 0 - name: Setup .NET SDK - uses: actions/setup-dotnet@v1.7.2 + uses: actions/setup-dotnet@v3.0.3 with: - dotnet-version: 5.0.x + dotnet-version: 7.0.x - name: Install MinVer run: dotnet tool install --global minver-cli - name: Run MinVer id: minver - run: echo '::set-output name=version::$(minver)' + run: echo "version=$(minver)" >> $env:GITHUB_OUTPUT - name: Download artifacts - uses: actions/download-artifact@v2.0.10 + uses: actions/download-artifact@v3.0.2 with: path: nuget.package/runtimes/ - name: Create package run: ./nuget.exe Pack nuget.package/NativeBinaries.nuspec -Version ${{ steps.minver.outputs.version }} -NoPackageAnalysis - name: Upload NuGet package - uses: actions/upload-artifact@v2.2.2 + uses: actions/upload-artifact@v3.1.2 with: name: NuGet package path: ./*.nupkg diff --git a/build.libgit2.ps1 b/build.libgit2.ps1 index 22d3200e..d9e6403f 100644 --- a/build.libgit2.ps1 +++ b/build.libgit2.ps1 @@ -118,7 +118,7 @@ try { if ($x86.IsPresent) { Write-Output "Building x86..." - Run-Command -Fatal { & $cmake -A Win32 -D ENABLE_TRACE=ON -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 "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 @@ -134,7 +134,7 @@ try { Write-Output "Building x64..." Run-Command -Quiet { & mkdir build64 } cd build64 - Run-Command -Fatal { & $cmake -A x64 -D THREADSAFE=ON -D USE_SSH=OFF -D ENABLE_TRACE=ON -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } + 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 --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration @@ -149,7 +149,7 @@ try { Write-Output "Building arm64..." Run-Command -Quiet { & mkdir buildarm64 } cd buildarm64 - Run-Command -Fatal { & $cmake -A ARM64 -D THREADSAFE=ON -D USE_SSH=OFF -D ENABLE_TRACE=ON -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. } + 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 --build . --config $configuration } if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } } cd $configuration diff --git a/nuget.exe b/nuget.exe index 0e535e73..d70c80b7 100644 Binary files a/nuget.exe and b/nuget.exe differ