Fix OD engine installation

tgstation · Oct 21, 2023 · 72e363a · 72e363a
1 parent a2b4d97
commit 72e363a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs b/src/Tgstation.Server.Host/Components/Engine/OpenDreamInstaller.cs
@@ -249,12 +249,10 @@ async ValueTask MoveDirs()
 				await Task.WhenAll(
 					dirs.Select(
 						dir => IOManager.MoveDirectory(
-							IOManager.ConcatPath(
-								deployPath,
-								dir),
+							dir,
 							IOManager.ConcatPath(
 								installPath,
-								dir),
+								IOManager.GetFileName(dir)),
 							cancellationToken)));
 			}
 
@@ -264,12 +262,10 @@ async ValueTask MoveFiles()
 				await Task.WhenAll(
 					files.Select(
 						file => IOManager.MoveFile(
-							IOManager.ConcatPath(
-								deployPath,
-								file),
+							file,
 							IOManager.ConcatPath(
 								installPath,
-								file),
+								IOManager.GetFileName(file)),
 							cancellationToken)));
 			}
 
@@ -321,7 +317,7 @@ protected void GetExecutablePaths(string installationPath, out string serverExeP
 				installationPath,
 				BinDir,
 				ServerDir,
-				$"OpenDreamServer{exeExtension}");
+				$"Robust.Server{exeExtension}");
 
 			compilerExePath = IOManager.ConcatPath(
 				installationPath,

diff --git a/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs b/tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
@@ -1376,15 +1376,6 @@ async Task FailFast(Task task)
 
 					async Task RunInstanceTests()
 					{
-						var byondApiCompatTests = FailFast(
-							instanceTest
-								.RunLegacyByondTest(
-									adminClient.Instances.CreateClient(byondApiCompatInstance),
-									cancellationToken));
-
-						if (TestingUtils.RunningInGitHubActions) // they only have 2 cores, can't handle intense parallelization
-							await byondApiCompatTests;
-
 						var odCompatTests = FailFast(
 							instanceTest
 								.RunCompatTests(
@@ -1395,9 +1386,18 @@ await EngineTest.GetEdgeVersion(EngineType.OpenDream, fileDownloader, cancellati
 									server.HighPriorityDreamDaemon,
 									cancellationToken));
 
-						if (TestingUtils.RunningInGitHubActions) // they only have 2 cores, can't handle intense parallelization
+						//if (TestingUtils.RunningInGitHubActions) // they only have 2 cores, can't handle intense parallelization
 							await odCompatTests;
 
+						var byondApiCompatTests = FailFast(
+							instanceTest
+								.RunLegacyByondTest(
+									adminClient.Instances.CreateClient(byondApiCompatInstance),
+									cancellationToken));
+
+						if (TestingUtils.RunningInGitHubActions) // they only have 2 cores, can't handle intense parallelization
+							await byondApiCompatTests;
+
 						// Some earlier linux BYOND versions have a critical bug where replacing the directory in non-basic watchdogs causes the DreamDaemon cwd to change
 						var canRunCompatTests = new PlatformIdentifier().IsWindows;
 						var compatTests = canRunCompatTests