Add -map-threads parameter support + 510 backwards compatibility and testing

.dockerignore

@@ -13,7 +13,7 @@ appveyor.yml
 omnisharp.json
 README.md
 build/package/**
-build/coverlet.runsettings
+build/ci.runsettings
 build/Dockerfile
 build/GenerateMigrations.sh
 build/OpenApiValidationSettings.json

.github/workflows/ci-pipeline.yml

@@ -31,7 +31,7 @@ on:
     - master
     - V6
   pull_request_target:
-    types: [opened, reopened, labeled, synchronize]
+    types: [ opened, reopened, labeled, synchronize ]
     branches:
     - dev
     - master
@@ -85,9 +85,10 @@ jobs:
     name: Build DMAPI
     needs: start-ci-run-gate
     if: "!(cancelled() || failure()) && needs.start-ci-run-gate.result == 'success'"
-    env:
-      BYOND_MAJOR: 515
-      BYOND_MINOR: 1606
+    strategy:
+      fail-fast: false
+      matrix:
+        byond: [ '510.1346', '511.1385', '512.1488', '513.1542', '514.1589', 'EDGE' ]
     runs-on: ubuntu-latest
     steps:
     - name: Install x86 libc Dependencies
@@ -96,20 +97,30 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386 libgcc-s1:i386
 
-    - name: Restore BYOND cache
+    - name: Cache BYOND .zips
       uses: actions/cache@v3
       id: cache-byond
       with:
-        path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
-        key: ${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}-dmapibyond
+        path: ~/byond-zips-cache
+        key: byond-zips
 
-    - name: Install BYOND
-      if: steps.cache-byond.outputs.cache-hit != 'true'
+    - name: Build BYOND Cache if Necessary and Install
       run: |
         echo "Setting up BYOND."
-        mkdir -p "$HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}"
-        cd "$HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}"
-        curl "http://www.byond.com/download/build/${{ env.BYOND_MAJOR }}/${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}_byond_linux.zip" -o byond.zip
+        FULL_VERSION=${{ matrix.byond }}
+        if [[ "$FULL_VERSION" = "EDGE" ]] ; then
+            VERSIONS=$(curl https://www.byond.com/download/version.txt)
+            FULL_VERSION=$(echo "$VERSIONS" | tail -n1)
+            echo "EDGE version evaluated to $FULL_VERSION"
+        fi
+        if [[ ! -f $HOME/byond-zips-cache/linux/$FULL_VERSION.zip ]] ; then
+            BYOND_MAJOR=${FULL_VERSION%.*}
+            mkdir -p $HOME/byond-zips-cache/linux
+            curl "https://www.byond.com/download/build/$BYOND_MAJOR/${FULL_VERSION}_byond_linux.zip" -o $HOME/byond-zips-cache/linux/$FULL_VERSION.zip
+        fi
+        mkdir -p "$HOME/BYOND"
+        cd "$HOME/BYOND"
+        cp $HOME/byond-zips-cache/linux/$FULL_VERSION.zip byond.zip
         unzip byond.zip
         cd byond
         make here
@@ -129,7 +140,7 @@ jobs:
       run: |
         set -e
         retval=1
-        source $HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}/byond/bin/byondsetup
+        source $HOME/BYOND/byond/bin/byondsetup
 
         if hash DreamMaker 2>/dev/null
         then
@@ -249,7 +260,7 @@ jobs:
       run: dotnet build -c ${{ matrix.configuration }}NoWindows
 
     - name: Run Unit Tests
-      run: sudo dotnet test --no-build --logger GitHubActions --filter FullyQualifiedName!~TestLiveServer -c ${{ matrix.configuration }}NoWindows --collect:"XPlat Code Coverage" --settings build/coverlet.runsettings --results-directory ./TestResults tgstation-server.sln
+      run: sudo dotnet test --no-build --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --filter TestCategory!=RequiresDatabase -c ${{ matrix.configuration }}NoWindows --collect:"XPlat Code Coverage" --settings build/ci.runsettings --results-directory ./TestResults tgstation-server.sln
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
@@ -292,7 +303,7 @@ jobs:
       run: dotnet build -c ${{ matrix.configuration }}NoWix
 
     - name: Run Unit Tests
-      run: dotnet test --no-build --logger GitHubActions --filter FullyQualifiedName!~TestLiveServer -c ${{ matrix.configuration }}NoWix --collect:"XPlat Code Coverage" --settings build/coverlet.runsettings --results-directory ./TestResults tgstation-server.sln
+      run: dotnet test --no-build --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --filter TestCategory!=RequiresDatabase -c ${{ matrix.configuration }}NoWix --collect:"XPlat Code Coverage" --settings build/ci.runsettings --results-directory ./TestResults tgstation-server.sln
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
@@ -311,9 +322,6 @@ jobs:
         watchdog-type: [ 'Basic', 'System' ]
         configuration: [ 'Debug', 'Release' ]
     runs-on: windows-latest
-    env:
-      BYOND_MAJOR: 514
-      BYOND_MINOR: 1588
     steps:
     - name: Wait for LocalDB Connection # Do this first because we don't want to find out it's failing later
       shell: powershell
@@ -327,21 +335,6 @@ jobs:
       with:
         dotnet-version: ${{ env.TGS_DOTNET_VERSION }}
 
-    - name: Restore BYOND cache
-      uses: actions/cache@v3
-      id: cache-byond
-      with:
-        path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
-        key: ${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}-livebyond
-
-    - name: Download BYOND
-      if: steps.cache-byond.outputs.cache-hit != 'true'
-      run: |
-        echo "Downloading BYOND..."
-        mkdir -p "$HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}"
-        cd "$HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}"
-        curl "http://www.byond.com/download/build/${{ env.BYOND_MAJOR }}/${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}_byond.zip" -o byond.zip
-
     - name: Set TGS_TEST_DUMP_API_SPEC
       if: ${{ matrix.configuration == 'Release' && matrix.watchdog-type == 'System' && matrix.database-type == 'SqlServer' }}
       run: echo "TGS_TEST_DUMP_API_SPEC=yes" >> $Env:GITHUB_ENV
@@ -414,11 +407,18 @@ jobs:
     - name: Build
       run: dotnet build -c ${{ matrix.configuration }} tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj
 
+    - name: Cache BYOND .zips
+      uses: actions/cache@v3
+      id: cache-byond
+      with:
+        path: ~/byond-zips-cache
+        key: byond-zips
+
     - name: Run Live Tests
       run: |
         cd tests/Tgstation.Server.Tests
         Start-Sleep -Seconds 10
-        dotnet test -c ${{ matrix.configuration }} --no-build --filter FullyQualifiedName~TestLiveServer --logger GitHubActions --collect:"XPlat Code Coverage" --settings ../../build/coverlet.runsettings --results-directory ../../TestResults
+        dotnet test -c ${{ matrix.configuration }} --no-build --filter TestCategory=RequiresDatabase --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --collect:"XPlat Code Coverage" --settings ../../build/ci.runsettings --results-directory ../../TestResults
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
@@ -516,9 +516,6 @@ jobs:
         watchdog-type: [ 'Basic', 'System' ]
         configuration: [ 'Debug', 'Release' ]
     runs-on: ubuntu-latest
-    env:
-      BYOND_MAJOR: 514
-      BYOND_MINOR: 1588
     steps:
     - name: Disable ptrace_scope
       run: echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope
@@ -529,21 +526,6 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386 gdb libgcc-s1:i386
 
-    - name: Restore BYOND cache
-      uses: actions/cache@v3
-      id: cache-byond
-      with:
-        path: $HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
-        key: ${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}-livebyond
-
-    - name: Download BYOND
-      if: steps.cache-byond.outputs.cache-hit != 'true'
-      run: |
-        echo "Downloading BYOND..."
-        mkdir -p "$HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}"
-        cd "$HOME/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}"
-        curl "http://www.byond.com/download/build/${{ env.BYOND_MAJOR }}/${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}_byond_linux.zip" -o byond.zip
-
     - name: Setup dotnet
       uses: actions/setup-dotnet@v2
       with:
@@ -594,11 +576,18 @@ jobs:
     - name: Build
       run: dotnet build -c ${{ matrix.configuration }}NoWindows tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj
 
+    - name: Cache BYOND .zips
+      uses: actions/cache@v3
+      id: cache-byond
+      with:
+        path: ~/byond-zips-cache
+        key: byond-zips
+
     - name: Run Live Tests
       run: |
         cd tests/Tgstation.Server.Tests
         sleep 10
-        dotnet test -c ${{ matrix.configuration }}NoWindows --filter FullyQualifiedName~TestLiveServer --logger GitHubActions --no-build --collect:"XPlat Code Coverage" --settings ../../build/coverlet.runsettings --results-directory ../../TestResults
+        dotnet test -c ${{ matrix.configuration }}NoWindows --filter TestCategory=RequiresDatabase --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" --no-build --collect:"XPlat Code Coverage" --settings ../../build/ci.runsettings --results-directory ../../TestResults
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
@@ -935,6 +924,23 @@ jobs:
         echo ${{ secrets.PACKAGING_PRIVATE_KEY_PASSPHRASE }} | gpg --batch --yes --passphrase-fd 0 --import private.pgp
         rm private.pgp
 
+    - name: Install dotnet-sdk-6.0
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y dotnet-sdk-6.0
+
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: ${{ env.TGS_DOTNET_VERSION }}
+
+    - name: Override /usr/bin/dotnet
+      run: |
+        DOTNET_PATH=$(which dotnet)
+        sudo rm /usr/bin/dotnet
+        sudo ln -s $DOTNET_PATH /usr/bin/dotnet
+        echo "New dotnet path should be $DOTNET_PATH"
+
     - name: Checkout (Branch)
       uses: actions/checkout@v3
       if: github.event_name == 'push' || github.event_name == 'schedule'

.gitignore

@@ -18,6 +18,7 @@ artifacts/
 /src/Tgstation.Server.Host/appsettings.*.json
 /src/Tgstation.Server.Host/appsettings.*.yml
 /src/Tgstation.Server.Host/wwwroot
+/src/Tgstation.Server.Host/--applicationName
 /src/Tgstation.Server.Host/ClientApp
 /tools/Tgstation.Server.ReleaseNotes/release_notes.md
 launchSettings.json

README.md

@@ -4,9 +4,7 @@
 
 [![GitHub license](https://img.shields.io/github/license/tgstation/tgstation-server.svg)](LICENSE) [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/tgstation/tgstation-server.svg)](http://isitmaintained.com/project/tgstation/tgstation-server "Average time to resolve an issue") [![NuGet version](https://img.shields.io/nuget/v/Tgstation.Server.Api.svg)](https://www.nuget.org/packages/Tgstation.Server.Api) [![NuGet version](https://img.shields.io/nuget/v/Tgstation.Server.Client.svg)](https://www.nuget.org/packages/Tgstation.Server.Client)
 
-[![forthebadge](http://forthebadge.com/images/badges/made-with-c-sharp.svg)](http://forthebadge.com) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
-
-[![forthebadge](http://forthebadge.com/images/badges/built-with-love.svg)](http://forthebadge.com) [![forthebadge](http://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](http://forthebadge.com)
+[![forthebadge](http://forthebadge.com/images/badges/made-with-c-sharp.svg)](http://forthebadge.com) [![forinfinityandbyond](https://user-images.githubusercontent.com/5211576/29499758-4efff304-85e6-11e7-8267-62919c3688a9.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a) [![forthebadge](http://forthebadge.com/images/badges/built-with-love.svg)](http://forthebadge.com)
 
 This is a toolset to manage production BYOND servers. It includes the ability to update the server without having to stop or shutdown the server (the update will take effect on a "reboot" of the server), the ability to start the server and restart it if it crashes, as well as systems for managing code and game files, and locally merging GitHub Pull Requests for test deployments.
 
@@ -521,7 +519,7 @@ Manual operations on the repository while an instance is running may lead to git
 
 #### Byond
 
-The `Byond` folder contains installations of [BYOND](https://secure.byond.com/) versions. The version which is used by your game code can be changed on a whim (Note that only versions >= 511.1385 have been thouroughly tested. Lower versions should work but if one doesn't function, please open an issue report) and the server will take care of installing it.
+The `Byond` folder contains installations of [BYOND](https://www.byond.com/) versions. The version which is used by your game code can be changed on a whim (Note that only versions >= 511.1385 have been thouroughly tested. Lower versions should work but if one doesn't function, please open an issue report) and the server will take care of installing it.
 
 #### Compiler
 

build/GenerateMigrations.sh

@@ -9,4 +9,5 @@ dotnet ef migrations add "MS$1" --context SqlServerDatabaseContext
 dotnet ef migrations add "MY$1" --context MySqlDatabaseContext
 dotnet ef migrations add "PG$1" --context PostgresSqlDatabaseContext
 dotnet ef migrations add "SL$1" --context SqliteDatabaseContext
+rm -f ./--applicationName # No idea why this file appears
 popd

build/Version.props

@@ -3,13 +3,13 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>5.12.7</TgsCoreVersion>
+    <TgsCoreVersion>5.13.0</TgsCoreVersion>
     <TgsConfigVersion>4.7.0</TgsConfigVersion>
-    <TgsApiVersion>9.10.2</TgsApiVersion>
+    <TgsApiVersion>9.11.0</TgsApiVersion>
     <TgsCommonLibraryVersion>6.0.0</TgsCommonLibraryVersion>
     <TgsApiLibraryVersion>11.0.0</TgsApiLibraryVersion>
     <TgsClientVersion>12.0.0</TgsClientVersion>
-    <TgsDmapiVersion>6.5.0</TgsDmapiVersion>
+    <TgsDmapiVersion>6.5.1</TgsDmapiVersion>
     <TgsInteropVersion>5.6.1</TgsInteropVersion>
     <TgsHostWatchdogVersion>1.3.0</TgsHostWatchdogVersion>
     <TgsContainerScriptVersion>1.2.1</TgsContainerScriptVersion>

build/coverlet.runsettings → build/ci.runsettings

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <RunSettings>
+  <RunConfiguration>
+    <CollectSourceInformation>true</CollectSourceInformation>
+  </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>
       <DataCollector friendlyName="XPlat Code Coverage">

src/DMAPI/tgs.dm

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

src/DMAPI/tgs/core/_definitions.dm

@@ -1,2 +1,10 @@
+#if DM_VERSION < 510
+#error The TGS DMAPI does not support BYOND versions < 510!
+#endif
+
 #define TGS_UNIMPLEMENTED "___unimplemented"
 #define TGS_VERSION_PARAMETER "server_service_version"
+
+#ifndef TGS_DEBUG_LOG
+#define TGS_DEBUG_LOG(message)
+#endif

src/DMAPI/tgs/v3210/commands.dm

@@ -47,12 +47,12 @@
 	user.friendly_name = sender
 
 	// Discord hack, fix the mention if it's only numbers (fuck you IRC trolls)
-	var/regex/discord_id_regex = regex(@"^[0-9]+$")
+	var/regex/discord_id_regex = regex("^\[0-9\]+$")
 	if(findtext(sender, discord_id_regex))
 		sender = "<@[sender]>"
 
 	user.mention = sender
 	var/datum/tgs_message_content/result = stc.Run(user, params)
 	result = UpgradeDeprecatedCommandResponse(result, command)
 
-	return result?.text || TRUE
+	return result ? result.text : TRUE

src/DMAPI/tgs/v4/commands.dm

@@ -40,5 +40,5 @@
 		var/datum/tgs_message_content/result = sc.Run(u, params)
 		result = UpgradeDeprecatedCommandResponse(result, command)
 
-		return result?.text
+		return result ? result.text : TRUE
 	return "Unknown command: [command]!"