diff --git a/Cake.Frosting.Issues.Recipe/Cake.Frosting.Issues.Recipe/BuildServers/GitHubActionsBuildServer.cs b/Cake.Frosting.Issues.Recipe/Cake.Frosting.Issues.Recipe/BuildServers/GitHubActionsBuildServer.cs index 83b10485..17992b11 100644 --- a/Cake.Frosting.Issues.Recipe/Cake.Frosting.Issues.Recipe/BuildServers/GitHubActionsBuildServer.cs +++ b/Cake.Frosting.Issues.Recipe/Cake.Frosting.Issues.Recipe/BuildServers/GitHubActionsBuildServer.cs @@ -1,5 +1,8 @@ namespace Cake.Frosting.Issues.Recipe; +using System; +using System.IO; +using System.Net.Http; using Cake.Common; using Cake.Common.Build; using Cake.Common.Diagnostics; @@ -138,10 +141,19 @@ public override void PublishIssuesArtifacts(IIssuesContext context) { context.NotNull(); + if (context.Parameters.BuildServer.ShouldPublishFullIssuesReport && + context.State.FullIssuesReport != null && + context.FileExists(context.State.FullIssuesReport)) + { + context.GitHubActions().Commands.UploadArtifact(context.State.FullIssuesReport, "Issues Report"); + } + if (context.Parameters.BuildServer.ShouldPublishSarifReport && context.State.SarifReport != null && context.FileExists(context.State.SarifReport)) { + context.GitHubActions().Commands.UploadArtifact(context.State.SarifReport, "SARIF Report"); + UploadSarifToCodeScanning(context); } } diff --git a/Cake.Issues.Recipe/Content/tasks/buildservers/GitHubActionsBuildServer.cake b/Cake.Issues.Recipe/Content/tasks/buildservers/GitHubActionsBuildServer.cake index 48bafe68..415688f6 100644 --- a/Cake.Issues.Recipe/Content/tasks/buildservers/GitHubActionsBuildServer.cake +++ b/Cake.Issues.Recipe/Content/tasks/buildservers/GitHubActionsBuildServer.cake @@ -133,10 +133,20 @@ public class GitHubActionsBuildServer : BaseBuildServer context.NotNull(); data.NotNull(); + if (IssuesParameters.BuildServer.ShouldPublishFullIssuesReport && + data.FullIssuesReport != null && + context.FileExists(data.FullIssuesReport)) + { + context.GitHubActions().Commands.UploadArtifact(data.FullIssuesReport, "Issues Report"); + } + if (IssuesParameters.BuildServer.ShouldPublishSarifReport && data.SarifReport != null && context.FileExists(data.SarifReport)) { + context.GitHubActions().Commands.UploadArtifact(data.SarifReport, "SARIF Report"); + + // Also upload SARIF to GitHub code scanning UploadSarifToCodeScanning(context, data); } } @@ -170,7 +180,7 @@ public class GitHubActionsBuildServer : BaseBuildServer var requestBody = new { commit_sha = data.CommitId, - ref_, + ref_ = ref_, sarif = sarifBase64, tool_name = "Cake.Issues.Recipe" };