Skip to content

Commit 39643c2

Browse files
authored
Merge branch 'main' into main
2 parents 40d1063 + 2ec04ae commit 39643c2

File tree

6 files changed

+23
-5
lines changed

6 files changed

+23
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ jobs:
3535
with:
3636
dotnet-version: '10.0.x'
3737
- run: dotnet pack NGitLab.sln --configuration Release --output ${{env.NuGetDirectory}} /bl
38-
- uses: actions/upload-artifact@v5
38+
- uses: actions/upload-artifact@v6
3939
with:
4040
name: nuget
4141
if-no-files-found: error
4242
retention-days: 7
4343
path: ${{env.NuGetDirectory}}/**/*
44-
- uses: actions/upload-artifact@v5
44+
- uses: actions/upload-artifact@v6
4545
with:
4646
name: binlogs
4747
if-no-files-found: error
@@ -84,7 +84,7 @@ jobs:
8484
- name: Run tests
8585
run: dotnet test --configuration ${{matrix.configuration}} --logger trx --results-directory "${{env.TestResultsDirectory}}" --collect:"XPlat Code Coverage" /p:RunAnalyzers=false
8686
- name: Upload test results
87-
uses: actions/upload-artifact@v5
87+
uses: actions/upload-artifact@v6
8888
if: always()
8989
with:
9090
name: ${{steps.set-artifact-name.outputs.artifact_name}}
@@ -107,7 +107,7 @@ jobs:
107107
contents: read
108108
packages: write
109109
steps:
110-
- uses: actions/download-artifact@v6
110+
- uses: actions/download-artifact@v7
111111
with:
112112
name: nuget
113113
path: ${{env.NuGetDirectory}}

NGitLab.Tests/NGitLab.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.12" />
1313
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
15-
<PackageReference Include="Microsoft.Playwright" Version="1.56.0" />
15+
<PackageReference Include="Microsoft.Playwright" Version="1.57.0" />
1616
<PackageReference Include="NuGet.Versioning" Version="7.0.1" />
1717
<PackageReference Include="NUnit" Version="4.4.0" />
1818
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">

NGitLab/Models/Deployable.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ public class Deployable
2020
[JsonPropertyName("created_at")]
2121
public DateTime CreatedAt { get; set; }
2222

23+
[JsonPropertyName("started_at")]
24+
public DateTime? StartedAt { get; set; }
25+
26+
[JsonPropertyName("finished_at")]
27+
public DateTime? FinishedAt { get; set; }
28+
2329
[JsonPropertyName("commit")]
2430
public Commit Commit { get; set; }
2531

NGitLab/PublicAPI/net472/PublicAPI.Unshipped.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,6 +1735,8 @@ NGitLab.Models.Deployable.Commit.set -> void
17351735
NGitLab.Models.Deployable.CreatedAt.get -> System.DateTime
17361736
NGitLab.Models.Deployable.CreatedAt.set -> void
17371737
NGitLab.Models.Deployable.Deployable() -> void
1738+
NGitLab.Models.Deployable.FinishedAt.get -> System.DateTime?
1739+
NGitLab.Models.Deployable.FinishedAt.set -> void
17381740
NGitLab.Models.Deployable.Id.get -> long
17391741
NGitLab.Models.Deployable.Id.set -> void
17401742
NGitLab.Models.Deployable.Name.get -> string
@@ -1743,6 +1745,8 @@ NGitLab.Models.Deployable.Pipeline.get -> NGitLab.Models.Pipeline
17431745
NGitLab.Models.Deployable.Pipeline.set -> void
17441746
NGitLab.Models.Deployable.Stage.get -> string
17451747
NGitLab.Models.Deployable.Stage.set -> void
1748+
NGitLab.Models.Deployable.StartedAt.get -> System.DateTime?
1749+
NGitLab.Models.Deployable.StartedAt.set -> void
17461750
NGitLab.Models.Deployable.Status.get -> string
17471751
NGitLab.Models.Deployable.Status.set -> void
17481752
NGitLab.Models.Deployment

NGitLab/PublicAPI/net8.0/PublicAPI.Unshipped.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,6 +1734,8 @@ NGitLab.Models.Deployable.Commit.set -> void
17341734
NGitLab.Models.Deployable.CreatedAt.get -> System.DateTime
17351735
NGitLab.Models.Deployable.CreatedAt.set -> void
17361736
NGitLab.Models.Deployable.Deployable() -> void
1737+
NGitLab.Models.Deployable.FinishedAt.get -> System.DateTime?
1738+
NGitLab.Models.Deployable.FinishedAt.set -> void
17371739
NGitLab.Models.Deployable.Id.get -> long
17381740
NGitLab.Models.Deployable.Id.set -> void
17391741
NGitLab.Models.Deployable.Name.get -> string
@@ -1742,6 +1744,8 @@ NGitLab.Models.Deployable.Pipeline.get -> NGitLab.Models.Pipeline
17421744
NGitLab.Models.Deployable.Pipeline.set -> void
17431745
NGitLab.Models.Deployable.Stage.get -> string
17441746
NGitLab.Models.Deployable.Stage.set -> void
1747+
NGitLab.Models.Deployable.StartedAt.get -> System.DateTime?
1748+
NGitLab.Models.Deployable.StartedAt.set -> void
17451749
NGitLab.Models.Deployable.Status.get -> string
17461750
NGitLab.Models.Deployable.Status.set -> void
17471751
NGitLab.Models.Deployment

NGitLab/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,6 +1735,8 @@ NGitLab.Models.Deployable.Commit.set -> void
17351735
NGitLab.Models.Deployable.CreatedAt.get -> System.DateTime
17361736
NGitLab.Models.Deployable.CreatedAt.set -> void
17371737
NGitLab.Models.Deployable.Deployable() -> void
1738+
NGitLab.Models.Deployable.FinishedAt.get -> System.DateTime?
1739+
NGitLab.Models.Deployable.FinishedAt.set -> void
17381740
NGitLab.Models.Deployable.Id.get -> long
17391741
NGitLab.Models.Deployable.Id.set -> void
17401742
NGitLab.Models.Deployable.Name.get -> string
@@ -1743,6 +1745,8 @@ NGitLab.Models.Deployable.Pipeline.get -> NGitLab.Models.Pipeline
17431745
NGitLab.Models.Deployable.Pipeline.set -> void
17441746
NGitLab.Models.Deployable.Stage.get -> string
17451747
NGitLab.Models.Deployable.Stage.set -> void
1748+
NGitLab.Models.Deployable.StartedAt.get -> System.DateTime?
1749+
NGitLab.Models.Deployable.StartedAt.set -> void
17461750
NGitLab.Models.Deployable.Status.get -> string
17471751
NGitLab.Models.Deployable.Status.set -> void
17481752
NGitLab.Models.Deployment

0 commit comments

Comments
 (0)