Merge pull request #1414 from tgstation/aa/dmapi-bump [DMDeploy]

DMAPI 515 compat for TGS3

.github/workflows/ci-suite.yml

@@ -51,8 +51,8 @@ jobs:
   dmapi-build:
     name: Build DMAPI
     env:
-      BYOND_MAJOR: 513
-      BYOND_MINOR: 1536
+      BYOND_MAJOR: 515
+      BYOND_MINOR: 1592
     runs-on: ubuntu-latest
     steps:
     - name: Install x86 libc Dependencies

build/Version.props

@@ -8,7 +8,7 @@
     <TgsApiVersion>9.7.0</TgsApiVersion>
     <TgsApiLibraryVersion>10.1.0</TgsApiLibraryVersion>
     <TgsClientVersion>11.1.0</TgsClientVersion>
-    <TgsDmapiVersion>6.0.5</TgsDmapiVersion>
+    <TgsDmapiVersion>6.0.6</TgsDmapiVersion>
     <TgsInteropVersion>5.3.0</TgsInteropVersion>
     <TgsHostWatchdogVersion>1.2.0</TgsHostWatchdogVersion>
     <TgsContainerScriptVersion>1.2.0</TgsContainerScriptVersion>

src/DMAPI/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.0.5"
+#define TGS_DMAPI_VERSION "6.0.6"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

src/DMAPI/tgs/v3210/api.dm

@@ -99,7 +99,11 @@
 	if(skip_compat_check && !fexists(SERVICE_INTERFACE_DLL))
 		TGS_ERROR_LOG("Service parameter present but no interface DLL detected. This is symptomatic of running a service less than version 3.1! Please upgrade.")
 		return
+	#if DM_VERSION >= 515
+	call_ext(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval
+	#else
 	call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval
+	#endif
 	return TRUE
 
 /datum/tgs_api/v3210/OnTopic(T)

tests/Tgstation.Server.Tests/Instance/ByondTest.cs

@@ -22,7 +22,7 @@ namespace Tgstation.Server.Tests.Instance
 {
 	sealed class ByondTest : JobsRequiredTest
 	{
-		public static readonly Version TestVersion = new (513, 1536);
+		public static readonly Version TestVersion = new (515, 1592);
 
 		readonly IByondClient byondClient;