From abcf062c10ad035e15be7238abbb6c7e6ee4f246 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 26 Dec 2023 20:28:00 -0500 Subject: [PATCH 1/4] Add the `EngineInstallComplete` event --- .../Components/Engine/EngineManager.cs | 2 ++ src/Tgstation.Server.Host/Components/Events/EventType.cs | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/Tgstation.Server.Host/Components/Engine/EngineManager.cs b/src/Tgstation.Server.Host/Components/Engine/EngineManager.cs index 529eec0fb8..00290840f0 100644 --- a/src/Tgstation.Server.Host/Components/Engine/EngineManager.cs +++ b/src/Tgstation.Server.Host/Components/Engine/EngineManager.cs @@ -476,6 +476,8 @@ namespace Tgstation.Server.Host.Components.Engine await InstallVersionFiles(progressReporter, version, customVersionStream, cancellationToken); ourTcs.SetResult(); + + await eventConsumer.HandleEvent(EventType.EngineInstallComplete, new List { versionString }, false, cancellationToken); } catch (Exception ex) { diff --git a/src/Tgstation.Server.Host/Components/Events/EventType.cs b/src/Tgstation.Server.Host/Components/Events/EventType.cs index fa8321c7e0..4872998c61 100644 --- a/src/Tgstation.Server.Host/Components/Events/EventType.cs +++ b/src/Tgstation.Server.Host/Components/Events/EventType.cs @@ -167,5 +167,11 @@ /// [EventScript("DeploymentActivation")] DeploymentActivation, + + /// + /// Parameters: Version being installed. + /// + [EventScript("EngineInstallComplete")] + EngineInstallComplete, } } From 3d34ce8cdbe693cb7c19ebb7139cf71670c1ea24 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 27 Dec 2023 14:02:02 -0500 Subject: [PATCH 2/4] Remove bad `launchSettings` --- src/Tgstation.Server.Host/Properties/launchSettings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Properties/launchSettings.json b/src/Tgstation.Server.Host/Properties/launchSettings.json index b93f29050d..9f38c2657e 100644 --- a/src/Tgstation.Server.Host/Properties/launchSettings.json +++ b/src/Tgstation.Server.Host/Properties/launchSettings.json @@ -13,7 +13,6 @@ "environmentVariables": { "DOTNET_ENVIRONMENT": "Development", "ASPNETCORE_ENVIRONMENT": "Development", - "Database__ConnectionString": "Data Source=192.168.2.16,1433;Initial Catalog=TGS_Linux;User Id=tgs_debug;Password=asdf;Encrypt=False;Application Name=tgstation-server", "General__ValidInstancePaths__0": "/home/dominion/tgs_debug_pen" } } From c82f07e0856cd3b6e4cadc4c1d9cc99f16bd3856 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 27 Dec 2023 14:02:17 -0500 Subject: [PATCH 3/4] Update webpanel to v5.4.2 --- build/WebpanelVersion.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/WebpanelVersion.props b/build/WebpanelVersion.props index 8b9090a805..5b674b1734 100644 --- a/build/WebpanelVersion.props +++ b/build/WebpanelVersion.props @@ -1,6 +1,6 @@ - 5.3.0 + 5.4.2 From 0a82b86bf4f63f1421e7f503eb7679707f1d5c96 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 27 Dec 2023 14:11:13 -0500 Subject: [PATCH 4/4] Version bump to 6.1.0 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index 61ce004864..def75d17ca 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 6.0.1 + 6.1.0 5.0.0 10.0.0 7.0.0