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

Merge pull request #1297 from tgstation/JustForWire

Browse Source 
Compilation event script improvements
This commit is contained in:
Jordan Brown
2021-08-18 14:41:58 -04:00
committed by GitHub
parent 87540616fb f329d6de5c
commit 8d95ae05cb
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs
+23 -1
View File
@@ -561,6 +561,7 @@ namespace Tgstation.Server.Host.Components.Deployment
{
resolvedOutputDirectory,
repoOrigin.ToString(),
$"{byondLock.Version.Major}.{byondLock.Version.Minor}",
},
cancellationToken)
.ConfigureAwait(false);
@@ -589,6 +590,18 @@ namespace Tgstation.Server.Host.Components.Deployment
await ModifyDme(job, cancellationToken).ConfigureAwait(false);
// run precompile scripts
await eventConsumer.HandleEvent(
EventType.PreDreamMaker,
new List<string>
{
resolvedOutputDirectory,
repoOrigin.ToString(),
$"{byondLock.Version.Major}.{byondLock.Version.Minor}",
},
cancellationToken)
.ConfigureAwait(false);
// run compiler
var exitCode = await RunDreamMaker(byondLock.DreamMakerPath, job, cancellationToken).ConfigureAwait(false);
@@ -619,13 +632,22 @@ namespace Tgstation.Server.Host.Components.Deployment
{
resolvedOutputDirectory,
exitCode == 0 ? "1" : "0",
$"{byondLock.Version.Major}.{byondLock.Version.Minor}",
},
cancellationToken)
.ConfigureAwait(false);
throw;
}
await eventConsumer.HandleEvent(EventType.CompileComplete, new List<string> { resolvedOutputDirectory }, cancellationToken).ConfigureAwait(false);
await eventConsumer.HandleEvent(
EventType.CompileComplete,
new List<string>
{
resolvedOutputDirectory,
$"{byondLock.Version.Major}.{byondLock.Version.Minor}",
},
cancellationToken)
.ConfigureAwait(false);
logger.LogTrace("Applying static game file symlinks...");
src/Tgstation.Server.Host/Components/Events/EventType.cs
+9 -3
View File
@@ -55,7 +55,7 @@
ByondActiveVersionChange,
/// <summary>
/// Parameters: Game directory path, origin commit sha
/// After the repo is copied, before CodeModifications are applied. Parameters: Game directory path, origin commit sha, byond version
/// </summary>
[EventScript("PreCompile")]
CompileStart,
@@ -67,13 +67,13 @@
CompileCancelled,
/// <summary>
/// Parameters: Game directory path, "1" if compile succeeded and api validation failed, "0" otherwise
/// Parameters: Game directory path, "1" if compile succeeded and api validation failed, "0" otherwise, BYOND version used
/// </summary>
[EventScript("CompileFailure")]
CompileFailure,
/// <summary>
/// Parameters: Game directory path
/// Parameters: Game directory path, BYOND version used
/// </summary>
[EventScript("PostCompile")]
CompileComplete,
@@ -149,5 +149,11 @@
/// </summary>
[EventScript("RepoSubmoduleUpdate")]
RepoSubmoduleUpdate,
/// <summary>
/// After CodeModifications are applied, before DreamMaker is run. Parameters: Game directory path, origin commit sha, byond version
/// </summary>
[EventScript("PreDreamMaker")]
PreDreamMaker,
}
}