1
0
mirror of https://github.com/ppy/osu synced 2025-04-01 22:48:33 +00:00

Merge pull request from peppy/local-deploy-fixes

Allow osu.Desktop.Deploy to work without a github token
This commit is contained in:
Dan Balasescu 2017-11-27 11:13:49 +09:00 committed by GitHub
commit 954bac6b54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
osu.Desktop.Deploy

View File

@ -13,7 +13,7 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste
<add key="ProjectName" value="osu.Desktop" /> <add key="ProjectName" value="osu.Desktop" />
<add key="NuSpecName" value="osu.Desktop\osu.nuspec" /> <add key="NuSpecName" value="osu.Desktop\osu.nuspec" />
<add key="SolutionName" value="osu" /> <add key="SolutionName" value="osu" />
<add key="TargetName" value="Client\osu.Desktop" /> <add key="TargetName" value="osu.Desktop" />
<add key="PackageName" value="osulazer" /> <add key="PackageName" value="osulazer" />
<add key="IconName" value="lazer.ico" /> <add key="IconName" value="lazer.ico" />
<add key="CodeSigningCertificate" value="" /> <add key="CodeSigningCertificate" value="" />

View File

@ -145,6 +145,8 @@ namespace osu.Desktop.Deploy
/// </summary> /// </summary>
private static void checkReleaseFiles() private static void checkReleaseFiles()
{ {
if (!canGitHub) return;
var releaseLines = getReleaseLines(); var releaseLines = getReleaseLines();
//ensure we have all files necessary //ensure we have all files necessary
@ -157,6 +159,8 @@ namespace osu.Desktop.Deploy
private static void pruneReleases() private static void pruneReleases()
{ {
if (!canGitHub) return;
write("Pruning RELEASES..."); write("Pruning RELEASES...");
var releaseLines = getReleaseLines().ToList(); var releaseLines = getReleaseLines().ToList();
@ -190,7 +194,7 @@ namespace osu.Desktop.Deploy
private static void uploadBuild(string version) private static void uploadBuild(string version)
{ {
if (string.IsNullOrEmpty(GitHubAccessToken) || string.IsNullOrEmpty(codeSigningCertPath)) if (!canGitHub || string.IsNullOrEmpty(CodeSigningCertificate))
return; return;
write("Publishing to GitHub..."); write("Publishing to GitHub...");
@ -228,8 +232,12 @@ namespace osu.Desktop.Deploy
private static void openGitHubReleasePage() => Process.Start(GitHubReleasePage); private static void openGitHubReleasePage() => Process.Start(GitHubReleasePage);
private static bool canGitHub => !string.IsNullOrEmpty(GitHubAccessToken);
private static void checkGitHubReleases() private static void checkGitHubReleases()
{ {
if (!canGitHub) return;
write("Checking GitHub releases..."); write("Checking GitHub releases...");
var req = new JsonWebRequest<List<GitHubRelease>>($"{GitHubApiEndpoint}"); var req = new JsonWebRequest<List<GitHubRelease>>($"{GitHubApiEndpoint}");
req.AuthenticatedBlockingPerform(); req.AuthenticatedBlockingPerform();