Merge pull request #549 from WildGums/GitHubSync/20231219-120013

GitHubSync update
WildGums · Dec 19, 2023 · 78df4ab · 78df4ab
2 parents b729ed7 + 9c7e40d
commit 78df4ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/deployment/cake/issuetrackers-github.cake b/deployment/cake/issuetrackers-github.cake
@@ -8,13 +8,11 @@ public class GitHubIssueTracker : IIssueTracker
     {
         BuildContext = buildContext;
 
-        UserName = buildContext.BuildServer.GetVariable("GitHubUserName", showValue: true);
         ApiKey = buildContext.BuildServer.GetVariable("GitHubApiKey", showValue: false);
         OwnerName = buildContext.BuildServer.GetVariable("GitHubOwnerName", buildContext.General.Copyright.Company, showValue: true);
         ProjectName = buildContext.BuildServer.GetVariable("GitHubProjectName", buildContext.General.Solution.Name, showValue: true);
 
-        if (!string.IsNullOrWhiteSpace(UserName) &&
-            !string.IsNullOrWhiteSpace(ApiKey) &&
+        if (!string.IsNullOrWhiteSpace(ApiKey) &&
             !string.IsNullOrWhiteSpace(OwnerName) &&
             !string.IsNullOrWhiteSpace(ProjectName))
         {
@@ -24,7 +22,6 @@ public class GitHubIssueTracker : IIssueTracker
 
     public BuildContext BuildContext { get; private set; }
 
-    public string UserName { get; set; }
     public string ApiKey { get; set; }
     public string OwnerName { get; set; }
     public string ProjectName { get; set; }

diff --git a/deployment/cake/sourcecontrol-github.cake b/deployment/cake/sourcecontrol-github.cake
@@ -1,5 +1,5 @@
 #addin "nuget:?package=Cake.GitHub&version=0.1.0"
-#addin "nuget:?package=Octokit&version=9.0.0"
+#addin "nuget:?package=Octokit&version=9.0.0"
 
 //-------------------------------------------------------------
 
@@ -9,13 +9,11 @@ public class GitHubSourceControl : ISourceControl
     {
         BuildContext = buildContext;
 
-        UserName = buildContext.BuildServer.GetVariable("GitHubUserName", buildContext.General.Repository.Username, showValue: true);
         ApiKey = buildContext.BuildServer.GetVariable("GitHubApiKey", buildContext.General.Repository.Password, showValue: false);
         OwnerName = buildContext.BuildServer.GetVariable("GitHubOwnerName", buildContext.General.Copyright.Company, showValue: true);
         ProjectName = buildContext.BuildServer.GetVariable("GitHubProjectName", buildContext.General.Solution.Name, showValue: true);
 
-        if (!string.IsNullOrWhiteSpace(UserName) &&
-            !string.IsNullOrWhiteSpace(ApiKey) &&
+        if (!string.IsNullOrWhiteSpace(ApiKey) &&
             !string.IsNullOrWhiteSpace(OwnerName) &&
             !string.IsNullOrWhiteSpace(ProjectName))
         {
@@ -25,7 +23,6 @@ public class GitHubSourceControl : ISourceControl
 
     public BuildContext BuildContext { get; private set; }
 
-    public string UserName { get; set; }
     public string ApiKey { get; set; }
     public string OwnerName { get; set; }
     public string ProjectName { get; set; }
@@ -66,7 +63,8 @@ public class GitHubSourceControl : ISourceControl
 
         var commitSha = BuildContext.General.Repository.CommitId;
 
-        BuildContext.CakeContext.GitHubStatus(UserName, ApiKey, OwnerName, ProjectName, commitSha, new GitHubStatusSettings
+        // Note: UserName is not really required, use string.Empty, then only api key is needed
+        BuildContext.CakeContext.GitHubStatus(string.Empty, ApiKey, OwnerName, ProjectName, commitSha, new GitHubStatusSettings
         {
             State = state,
             TargetUrl = null,// "url-to-build-server",