cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 14:06:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge build errors

Browse Source
This commit is contained in:
Jordan Dominion
2023-10-20 21:41:24 -04:00
parent c0e5c5fb0e
commit 65d9785c24
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
+4 -4
View File
@@ -1027,7 +1027,7 @@ namespace Tgstation.Server.Tests.Live
if (postWriteHandler.NeedsPostWrite(src))
postWriteHandler.HandleWrite(dest);
return Task.CompletedTask;
return ValueTask.CompletedTask;
},
ioManager.ConcatPath(
localRepoPath,
@@ -1080,7 +1080,7 @@ namespace Tgstation.Server.Tests.Live
jobWaitTask = jobsTest.WaitForJob(repoResponse.ActiveJob, 300, false, null, cancellationToken);
}
await Task.WhenAll(jobWaitTask, ddUpdateTask, dmUpdateTask);
await Task.WhenAll(jobWaitTask, ddUpdateTask.AsTask(), dmUpdateTask.AsTask());
var depsBytesTask = ioManager.ReadAllBytes(
ioManager.ConcatPath(repoPath, "dependencies.sh"),
@@ -1093,7 +1093,7 @@ namespace Tgstation.Server.Tests.Live
if (postWriteHandler.NeedsPostWrite(src))
postWriteHandler.HandleWrite(dest);
return Task.CompletedTask;
return ValueTask.CompletedTask;
},
ioManager.ConcatPath(
repoPath,
@@ -1120,7 +1120,7 @@ namespace Tgstation.Server.Tests.Live
var byondJobTask = jobsTest.WaitForJob(byondJob.InstallJob, 60, false, null, cancellationToken);
await Task.WhenAll(scriptsCopyTask, byondJobTask);
await Task.WhenAll(scriptsCopyTask.AsTask(), byondJobTask);
var compileJob = await instanceClient.DreamMaker.Compile(cancellationToken);