cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 00:22:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix fucking master merge again
This commit is contained in:
Jordan Dominion
2024-08-22 22:55:51 -04:00
committed by GitHub
parent 5a5ba13f82 428d97e6fc
commit 07c65162e6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/stable-merge.yml
+2 -1
View File
@@ -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 }}
build/Version.props
+1 -1
View File
@@ -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>
src/Tgstation.Server.Host/System/Process.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace Tgstation.Server.Host.System
{
try
{
return handle.VirtualMemorySize64;
return handle.PrivateMemorySize64;
}
catch (Exception ex)
{