Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 6eba832

Browse files
Merge remote-tracking branch 'remotes/origin/fixes/octorun-output-refactoring' into stanley/0.31-rc
2 parents b1fef49 + 8d94815 commit 6eba832

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7cdaa49008b8c996343e07670100bce2
1+
070a4561bf70031ad54ca5884f97f546

src/GitHub.Api/Tasks/OctorunTask.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
using System.Collections.Generic;
33
using System.Diagnostics;
44
using System.Linq;
5-
using System.Reflection;
65
using System.Text.RegularExpressions;
76
using System.Threading;
8-
using GitHub.Logging;
97

108
namespace GitHub.Unity
119
{
@@ -115,9 +113,6 @@ public override void Configure(ProcessStartInfo psi)
115113

116114
class OctorunResult
117115
{
118-
public string Status { get; }
119-
public string[] Output { get; }
120-
121116
public OctorunResult()
122117
{
123118
Status = "error";
@@ -130,12 +125,15 @@ public OctorunResult(string status, string[] output)
130125
Output = output;
131126
}
132127

128+
public string Status { get; }
129+
public string[] Output { get; }
133130
public bool IsSuccess => Status.Equals("success", StringComparison.InvariantCultureIgnoreCase);
134131
public bool IsError => Status.Equals("error", StringComparison.InvariantCultureIgnoreCase);
135132
public bool IsTwoFactorRequired => Status.Equals("2fa", StringComparison.InvariantCultureIgnoreCase);
136133
}
137134

138-
static class OctorunResultExtensions {
135+
static class OctorunResultExtensions
136+
{
139137
private static Regex ApiErrorMessageRegex = new Regex(@"\""message\"":\""(.*?)\""", RegexOptions.Compiled);
140138

141139
internal static string GetApiErrorMessage(this OctorunResult octorunResult)
@@ -149,4 +147,4 @@ internal static string GetApiErrorMessage(this OctorunResult octorunResult)
149147
return match.Success ? match.Groups[1].Value : octorunResult.Output[0];
150148
}
151149
}
152-
}
150+
}

0 commit comments

Comments
 (0)