Skip to content

Commit 8a84092

Browse files
authored
Merge pull request #148 from libgit2/update-ci
Update CI workflow
2 parents 3e23c2e + 6879531 commit 8a84092

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/ci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
fail-fast: false
4545
steps:
4646
- name: Checkout
47-
uses: actions/checkout@v2.3.4
47+
uses: actions/checkout@v3.5.0
4848
with:
4949
submodules: true
5050
- name: Build Windows
@@ -60,7 +60,7 @@ jobs:
6060
if: runner.os == 'Linux'
6161
run: ./dockerbuild.sh
6262
- name: Upload artifacts
63-
uses: actions/upload-artifact@v2.2.2
63+
uses: actions/upload-artifact@v3.1.2
6464
with:
6565
name: ${{ matrix.name }}
6666
path: nuget.package/runtimes/${{ matrix.name }}
@@ -72,26 +72,26 @@ jobs:
7272
DOTNET_NOLOGO: true
7373
steps:
7474
- name: Checkout
75-
uses: actions/checkout@v2.3.4
75+
uses: actions/checkout@v3.5.0
7676
with:
7777
fetch-depth: 0
7878
- name: Setup .NET SDK
79-
uses: actions/setup-dotnet@v1.7.2
79+
uses: actions/setup-dotnet@v3.0.3
8080
with:
81-
dotnet-version: 5.0.x
81+
dotnet-version: 7.0.x
8282
- name: Install MinVer
8383
run: dotnet tool install --global minver-cli
8484
- name: Run MinVer
8585
id: minver
86-
run: echo '::set-output name=version::$(minver)'
86+
run: echo "version=$(minver)" >> $env:GITHUB_OUTPUT
8787
- name: Download artifacts
88-
uses: actions/download-artifact@v2.0.10
88+
uses: actions/download-artifact@v3.0.2
8989
with:
9090
path: nuget.package/runtimes/
9191
- name: Create package
9292
run: ./nuget.exe Pack nuget.package/NativeBinaries.nuspec -Version ${{ steps.minver.outputs.version }} -NoPackageAnalysis
9393
- name: Upload NuGet package
94-
uses: actions/upload-artifact@v2.2.2
94+
uses: actions/upload-artifact@v3.1.2
9595
with:
9696
name: NuGet package
9797
path: ./*.nupkg

build.libgit2.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ try {
118118

119119
if ($x86.IsPresent) {
120120
Write-Output "Building x86..."
121-
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" .. }
121+
Run-Command -Fatal { & $cmake -A Win32 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" .. }
122122
Run-Command -Fatal { & $cmake --build . --config $configuration }
123123
if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
124124
cd $configuration
@@ -134,7 +134,7 @@ try {
134134
Write-Output "Building x64..."
135135
Run-Command -Quiet { & mkdir build64 }
136136
cd build64
137-
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" ../.. }
137+
Run-Command -Fatal { & $cmake -A x64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
138138
Run-Command -Fatal { & $cmake --build . --config $configuration }
139139
if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
140140
cd $configuration
@@ -149,7 +149,7 @@ try {
149149
Write-Output "Building arm64..."
150150
Run-Command -Quiet { & mkdir buildarm64 }
151151
cd buildarm64
152-
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" ../.. }
152+
Run-Command -Fatal { & $cmake -A ARM64 -D USE_SSH=OFF -D "BUILD_TESTS=$build_tests" -D "BUILD_CLI=OFF" -D "LIBGIT2_FILENAME=$binaryFilename" ../.. }
153153
Run-Command -Fatal { & $cmake --build . --config $configuration }
154154
if ($test.IsPresent) { Run-Command -Quiet -Fatal { & $ctest -V . } }
155155
cd $configuration

nuget.exe

530 KB
Binary file not shown.

0 commit comments

Comments
 (0)