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

Fix interop TestMerge contructor issues

Browse Source
This commit is contained in:
Jordan Brown
2018-08-18 14:13:35 -04:00
parent 4d1c29c1cb
commit bef79e63a8
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Interop/TestMerge.cs
+5 -7
View File
@@ -1,4 +1,5 @@
using System.Globalization;
using System;
using System.Globalization;
using Tgstation.Server.Api.Models.Internal;
namespace Tgstation.Server.Host.Components.Interop
@@ -22,14 +23,11 @@ namespace Tgstation.Server.Host.Components.Interop
/// Construct a <see cref="TestMerge"/>
/// </summary>
/// <param name="testMerge">The <see cref="Models.TestMerge"/> to build from</param>
public TestMerge(Models.TestMerge testMerge) : base(testMerge)
/// <param name="revision">The value of <see cref="Revision"/></param>
public TestMerge(Models.TestMerge testMerge, RevisionInformation revision) : base(testMerge)
{
TimeMerged = testMerge.MergedAt.Ticks.ToString(CultureInfo.InvariantCulture);
Revision = new RevisionInformation
{
CommitSha = testMerge.PrimaryRevisionInformation.CommitSha,
OriginCommitSha = testMerge.PrimaryRevisionInformation.OriginCommitSha
};
Revision = revision ?? throw new ArgumentNullException(nameof(revision));
}
}
}
src/Tgstation.Server.Host/Components/Watchdog/SessionControllerFactory.cs
+1 -1
View File
@@ -147,7 +147,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
};
interopInfo.TestMerges.AddRange(dmbProvider.CompileJob.RevisionInformation.ActiveTestMerges.Select(x => x.TestMerge).Select(x => new Interop.TestMerge(x)));
interopInfo.TestMerges.AddRange(dmbProvider.CompileJob.RevisionInformation.ActiveTestMerges.Select(x => x.TestMerge).Select(x => new Interop.TestMerge(x, interopInfo.Revision)));
var interopJsonFile = JsonFile("interop");