Skip to content

Commit 1092adf

Browse files
committed
Fix build
1 parent d9bec7a commit 1092adf

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

src/infrastructure/Silk.NET.NUKE/Build.Native.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ partial class Build
3131

3232
[CanBeNull] string AndroidHomeValue;
3333

34-
static string JobsArg => string.IsNullOrWhiteSpace(GitHubActions.Instance?.GitHubJob)
34+
static string JobsArg => string.IsNullOrWhiteSpace(GitHubActions.Instance?.Job)
3535
? $" -j{Environment.ProcessorCount}"
3636
: string.Empty;
3737

@@ -456,7 +456,7 @@ void PrUpdatedNativeBinary(string name)
456456
var pushableToken = EnvironmentInfo.GetVariable<string>("PUSHABLE_GITHUB_TOKEN");
457457
var curBranch = GitCurrentBranch(RootDirectory);
458458
if (!string.IsNullOrWhiteSpace(pushableToken) &&
459-
GitHubActions.Instance?.GitHubRepository == "dotnet/Silk.NET" &&
459+
GitHubActions.Instance?.Repository == "dotnet/Silk.NET" &&
460460
curBranch != "HEAD" &&
461461
!string.IsNullOrWhiteSpace(curBranch) &&
462462
!curBranch.StartsWith("ci/", StringComparison.OrdinalIgnoreCase) && // ignore other CI branches

src/infrastructure/Silk.NET.NUKE/Build.PublicApi.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ partial class Build
7676
var cmd = string.Format
7777
(
7878
FormatDeclCmd,
79-
GitHubActions.Instance.GitHubRef?.Contains("/pull/") ?? false
79+
GitHubActions.Instance.Ref?.Contains("/pull/") ?? false
8080
? "inbound_pr/Silk.NET.sln"
8181
: "Silk.NET.sln"
8282
);
@@ -106,7 +106,7 @@ void MakePr()
106106
{
107107
var pushableToken = EnvironmentInfo.GetVariable<string>("PUSHABLE_GITHUB_TOKEN");
108108
var curBranch = GitCurrentBranch(RootDirectory);
109-
if (GitHubActions.Instance?.GitHubRepository == "dotnet/Silk.NET" &&
109+
if (GitHubActions.Instance?.Repository == "dotnet/Silk.NET" &&
110110
!string.IsNullOrWhiteSpace(pushableToken))
111111
{
112112
if (curBranch == "HEAD" || string.IsNullOrWhiteSpace(curBranch))

src/infrastructure/Silk.NET.NUKE/Build.Support.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ async Task AddOrUpdatePrComment(string type, string file, bool editOnly = false,
134134
return;
135135
}
136136

137-
var @ref = GitHubActions.Instance.GitHubRef;
137+
var @ref = GitHubActions.Instance?.Ref;
138138
if (string.IsNullOrWhiteSpace(@ref))
139139
{
140140
Logger.Info("Not running in GitHub Actions, skipping writing a comment.");
@@ -176,7 +176,7 @@ async Task AddOrUpdatePrComment(string type, string file, bool editOnly = false,
176176
commentText = commentText.Replace($"{{{key}}}", value);
177177
}
178178

179-
commentText = commentText.Replace("{actionsRun}", GitHubActions.Instance.GitHubRunNumber.ToString())
179+
commentText = commentText.Replace("{actionsRun}", GitHubActions.Instance?.RunNumber.ToString())
180180
.Replace("{typeId}", type);
181181

182182
if (existingComment is not null)
@@ -211,8 +211,6 @@ async Task AddOrUpdatePrComment(string type, string file, bool editOnly = false,
211211
toolSettings.ProcessExecutionTimeout,
212212
toolSettings.ProcessLogOutput,
213213
toolSettings.ProcessLogInvocation,
214-
toolSettings.ProcessLogTimestamp,
215-
toolSettings.ProcessLogFile,
216214
toolSettings.ProcessCustomLogger,
217215
arguments.FilterSecrets
218216
);

src/infrastructure/Silk.NET.NUKE/Silk.NET.NUKE.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
16-
<PackageReference Include="Nuke.Common" Version="5.3.0" />
16+
<PackageReference Include="Nuke.Common" Version="6.0.1" />
1717
</ItemGroup>
1818

1919
</Project>

0 commit comments

Comments
 (0)