Merge pull request #1904 from tgstation/Begone [TGSDeploy]

Fix fucking master merge again
tgstation · Aug 23, 2024 · 07c6516 · 07c6516
2 parents 5a5ba13 + 428d97e
commit 07c6516
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml
@@ -37,6 +37,7 @@ jobs:
           allow_forks: true
           user_name: tgstation-server-ci[bot]
           user_email: 161980869+tgstation-server-ci[bot]@users.noreply.github.com
-          push_token: ${{ steps.app-token-generation.outputs.token }}
+          push_token: INSTALLATION_TOKEN
         env:
           GITHUB_TOKEN: ${{ steps.app-token-generation.outputs.token }}
+          INSTALLATION_TOKEN: ${{ steps.app-token-generation.outputs.token }}
diff --git a/build/Version.props b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="WebpanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>6.9.0</TgsCoreVersion>
+    <TgsCoreVersion>6.9.1</TgsCoreVersion>
     <TgsConfigVersion>5.2.0</TgsConfigVersion>
     <TgsApiVersion>10.7.0</TgsApiVersion>
     <TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>

diff --git a/src/Tgstation.Server.Host/System/Process.cs b/src/Tgstation.Server.Host/System/Process.cs
@@ -29,7 +29,7 @@ public long? MemoryUsage
 			{
 				try
 				{
-					return handle.VirtualMemorySize64;
+					return handle.PrivateMemorySize64;
 				}
 				catch (Exception ex)
 				{
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ public long? MemoryUsage @@
     			{
     				try
     				{
-    					return handle.VirtualMemorySize64;
+    					return handle.PrivateMemorySize64;
     				}
     				catch (Exception ex)
     				{
@@ Expand Down @@