cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 22:48:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #404 from tgstation/Cyberboss-patch-1

Browse Source 
Changelog and synchronize errors no longer stop the update process
This commit is contained in:
Jordan Brown
2017-11-20 16:38:55 -05:00
committed by GitHub
parent 26b0e8809a 771397cb21
commit 34904cb53b
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.ControlPanel/ControlPanel/ServerPage.cs
+2 -11
View File
@@ -1,5 +1,5 @@
using Octokit;
using System;
using Octokit;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Reflection;
@@ -347,18 +347,12 @@ namespace TGS.ControlPanel
await Task.Factory.StartNew(() => repo.GenerateChangelog(out res));
if (res != null)
{
MessageBox.Show(res, "Error generating changelog");
return;
}
res = await Task.Factory.StartNew(() => repo.SynchronizePush());
if (res != null)
{
MessageBox.Show(res, "Error synchronizing commits");
return;
}
if (pullsRequests != null)
Task.WaitAll(pullsRequests.ToArray());
@@ -431,10 +425,7 @@ namespace TGS.ControlPanel
await Task.Factory.StartNew(() => repo.GenerateChangelog(out res));
if (res != null)
{
MessageBox.Show(res, "Error generating changelog");
return;
}
await Task.Factory.StartNew(() => Interface.GetComponent<ITGCompiler>().Compile(false));
if (res != null)