From f707d7812f94927e562b8c6f4fcd87440e2dcb8a Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Thu, 13 Jul 2023 08:54:10 -0400 Subject: [PATCH] Do not support 510 with system watchdog on Linux --- src/DMAPI/tgs/v5/api.dm | 3 +++ tests/Tgstation.Server.Tests/Live/TestLiveServer.cs | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/DMAPI/tgs/v5/api.dm b/src/DMAPI/tgs/v5/api.dm index 34cc43f876..9a0f3be7df 100644 --- a/src/DMAPI/tgs/v5/api.dm +++ b/src/DMAPI/tgs/v5/api.dm @@ -24,6 +24,9 @@ /datum/tgs_api/v5/New() . = ..() +#if DM_VERSION < 511 + TGS_WARNING_LOG("TGS V5 interop does not support the non-basic watchdog on versions prior to 511! Make sure you've configured the basic watchdog in TGS setting or update BYOND!") +#endif TGS_DEBUG_LOG("V5 API created") /datum/tgs_api/v5/ApiVersion() diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs index d7a6a09156..7b734f3d06 100644 --- a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs +++ b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs @@ -1120,7 +1120,10 @@ namespace Tgstation.Server.Tests.Live var compatTests = FailFast( instanceTest .RunCompatTests( - new Version(510, 1346), + // linux 510 has a critical bug where replacing the directory in non-basic watchdogs causes the DreamDaemon cwd to change + new PlatformIdentifier().IsWindows || Environment.GetEnvironmentVariable("General__UseBasicWatchdog") == "true" + ? new Version(510, 1346) + : new Version(511, 1385), adminClient.Instances.CreateClient(compatInstance), compatDMPort, compatDDPort,