From 9f89cbd3820576546438a9c85f62de8349820aae Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 22 Aug 2024 20:37:26 -0400
Subject: [PATCH 1/3] Fix fucking master merge again

---
 .github/workflows/stable-merge.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/stable-merge.yml b/.github/workflows/stable-merge.yml
index f467dac933..7bd9cf84fd 100644
--- 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 }}

From 946e5dff86962f88bb43a6a3fcec48fdcba51c91 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 22 Aug 2024 21:06:40 -0400
Subject: [PATCH 2/3] Fix process memory retrieval

---
 src/Tgstation.Server.Host/System/Process.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tgstation.Server.Host/System/Process.cs b/src/Tgstation.Server.Host/System/Process.cs
index 13a1a278f5..e180cfc3cc 100644
--- a/src/Tgstation.Server.Host/System/Process.cs
+++ b/src/Tgstation.Server.Host/System/Process.cs
@@ -29,7 +29,7 @@ namespace Tgstation.Server.Host.System
 			{
 				try
 				{
-					return handle.VirtualMemorySize64;
+					return handle.PrivateMemorySize64;
 				}
 				catch (Exception ex)
 				{

From 428d97e6fc906ebc4501f5f57306f1ee475ec961 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 22 Aug 2024 21:07:42 -0400
Subject: [PATCH 3/3] Version bump to 6.9.1

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index f524e2ee69..fe1a952886 100644
--- 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>