diff --git a/.github/workflows/tgs_test.yml b/.github/workflows/tgs_test.yml index e78cb6e400d8..a92b6cac76a3 100644 --- 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 index b8967dbc156d..9b018be95167 100644 --- 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 index 0a641c269ab2..967fbd429516 100644 --- a/tools/tgs_test/Tgstation.TgsTest.csproj +++ b/tools/tgs_test/Tgstation.TgsTest.csproj @@ -1,16 +1,17 @@ - 1.0.0 + 2.0.0 Exe - net7.0 + net8.0 enable enable - - + + +