fixes TGS test

shiptest-ss13 · Dec 30, 2023 · 8ac66ae · 8ac66ae
1 parent 84df369
commit 8ac66ae
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/tgs_test.yml b/.github/workflows/tgs_test.yml
@@ -35,7 +35,7 @@ env:
   PR_NUMBER: ${{ github.event.number }}
 jobs:
   test_tgs_docker:
-    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    if: ( !contains(github.event.head_commit.message, '[ci skip]') )
     name: Test TGS Docker
     runs-on: ubuntu-22.04
     concurrency:
@@ -47,7 +47,7 @@ jobs:
         env:
           Database__DatabaseType: Sqlite
           Database__ConnectionString: Data Source=TGS_TGTest.sqlite3;Mode=ReadWriteCreate
-          General__ConfigVersion: 4.1.0
+          General__ConfigVersion: 5.0.0
           General__ApiPort: ${{ env.TGS_API_PORT }}
           General__SetupWizardMode: Never
         ports:
@@ -56,7 +56,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Checkout Repository
         uses: actions/checkout@v3

diff --git a/tools/tgs_test/Program.cs b/tools/tgs_test/Program.cs
@@ -11,6 +11,7 @@
 using Tgstation.Server.Api.Models;
 using Tgstation.Server.Api.Models.Response;
 using Tgstation.Server.Client;
+using Tgstation.Server.Common.Extensions;
 using YamlDotNet.Serialization.NamingConventions;
 using YamlDotNet.Serialization;
 
@@ -202,10 +203,14 @@
 		default);
 
 	Console.WriteLine("Installing BYOND...");
-	var byondInstallJob = await instanceClient.Byond.SetActiveVersion(
-		new ByondVersionRequest
+	var byondInstallJob = await instanceClient.Engine.SetActiveVersion(
+		new EngineVersionRequest
 		{
-			Version = targetByondVersion
+			EngineVersion = new EngineVersion
+			{
+				Version = targetByondVersion,
+				Engine = EngineType.Byond,
+			}
 		},
 		null,
 		default);

diff --git a/tools/tgs_test/Tgstation.TgsTest.csproj b/tools/tgs_test/Tgstation.TgsTest.csproj
@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.0.0</Version>
+    <Version>2.0.0</Version>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Octokit" Version="5.0.0" />
-    <PackageReference Include="Tgstation.Server.Client" Version="11.2.1" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="Octokit" Version="9.0.0" />
+    <PackageReference Include="Tgstation.Server.Client" Version="15.0.0" />
     <PackageReference Include="YamlDotNet.NetCore" Version="1.0.0" />
   </ItemGroup>