Merge pull request #1436 from nunit/issue-1428b

Fix Build script problems with api keys
nunit · Jul 2, 2024 · 48d96aa · 48d96aa
2 parents c4d49d0 + ad6848a
commit 48d96aa
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/cake/build-settings.cake b/cake/build-settings.cake
@@ -220,17 +220,22 @@ public static class BuildSettings
 			? CommandLineOptions.TestLevel.Value
 			: CalcPackageTestLevel();
 
-    // Publishing
+	// Publishing - MyGet
 	public static string MyGetPushUrl => MYGET_PUSH_URL;
+	public static string MyGetApiKey => Context.EnvironmentVariable(MYGET_API_KEY);
+
+	// Publishing - NuGet
 	public static string NuGetPushUrl => NUGET_PUSH_URL;
+	public static string NuGetApiKey => Context.EnvironmentVariable(NUGET_API_KEY);
+
+	// Publishing - Chocolatey
 	public static string ChocolateyPushUrl => CHOCO_PUSH_URL;
+	public static string ChocolateyApiKey => Context.EnvironmentVariable(CHOCO_API_KEY);
 
-	public static string MyGetApiKey { get; private set; }
-	public static string NuGetApiKey { get; private set; }
-	public static string ChocolateyApiKey { get; private set;}
-    public static string GitHubOwner { get; private set; }
-    public static string GitHubRepository { get; private set; }
-	public static string GitHubAccessToken { get; private set; }
+	// Publishing - GitHub
+	public static string GitHubOwner { get; set; }
+	public static string GitHubRepository { get; set; }
+	public static string GitHubAccessToken => Context.EnvironmentVariable(GITHUB_ACCESS_TOKEN);
 
 	public static bool IsPreRelease => BuildVersion.IsPreRelease;
 	public static bool ShouldPublishToMyGet =>
@@ -318,6 +323,7 @@ public static class BuildSettings
 		Console.WriteLine("MyGetApiKey:               " + (!string.IsNullOrEmpty(MyGetApiKey) ? "AVAILABLE" : "NOT AVAILABLE"));
 		Console.WriteLine("NuGetApiKey:               " + (!string.IsNullOrEmpty(NuGetApiKey) ? "AVAILABLE" : "NOT AVAILABLE"));
 		Console.WriteLine("ChocolateyApiKey:          " + (!string.IsNullOrEmpty(ChocolateyApiKey) ? "AVAILABLE" : "NOT AVAILABLE"));
+        Console.WriteLine("GitHubAccessToken:         " + (!string.IsNullOrEmpty(GitHubAccessToken) ? "AVAILABLE" : "NOT AVAILABLE"));
 
 		Console.WriteLine("\nPACKAGES");
 		foreach (var package in Packages)