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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Jordan Dominion
2024-03-08 14:46:19 -05:00
parent dc193f39d0 8332ae846b
commit 3adbc08c60
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci-pipeline.yml
+6 -1
View File
@@ -1420,7 +1420,12 @@ jobs:
- name: Build ReleaseNotes
run: dotnet build -c Release -p:TGS_HOST_NO_WEBPANEL=true tools/Tgstation.Server.ReleaseNotes/Tgstation.Server.ReleaseNotes.csproj
- name: Run ReleaseNotes Create CI Completion Check
- name: Run ReleaseNotes Create CI Completion Check (PR HEAD)
if: github.event_name != 'push' && github.event_name != 'schedule'
run: dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --ci-completion-check ${{ github.event.pull_request.head.sha }} ${{ secrets.TGS_CI_GITHUB_APP_TOKEN_BASE64 }}
- name: Run ReleaseNotes Create CI Completion Check (Branch)
if: github.event_name == 'push' || github.event_name == 'schedule'
run: dotnet run -c Release --no-build --project tools/Tgstation.Server.ReleaseNotes --ci-completion-check ${{ github.sha }} ${{ secrets.TGS_CI_GITHUB_APP_TOKEN_BASE64 }}
deployment-gate:
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.3.2</TgsCoreVersion>
<TgsCoreVersion>6.4.0</TgsCoreVersion>
<TgsConfigVersion>5.1.0</TgsConfigVersion>
<TgsApiVersion>10.2.0</TgsApiVersion>
<TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>
src/Tgstation.Server.Host/System/PosixProcessFeatures.cs
+5 -4
View File
@@ -172,10 +172,11 @@ namespace Tgstation.Server.Host.System
var originalOomAdjust = Int16.Parse(trimmedString, CultureInfo.InvariantCulture);
baselineOomAdjust = Math.Clamp(originalOomAdjust, (short)-1000, (short)1000);
if (originalOomAdjust != baselineOomAdjust)
logger.LogWarning("oom_score_adj is at it's limit of 1000 (Clamped from {original}). TGS cannot guarantee the kill order of its parent/child processes!", originalOomAdjust);
else
logger.LogWarning("oom_score_adj is at it's limit of 1000. TGS cannot guarantee the kill order of its parent/child processes!");
if (baselineOomAdjust == 1000)
if (originalOomAdjust != baselineOomAdjust)
logger.LogWarning("oom_score_adj is at it's limit of 1000 (Clamped from {original}). TGS cannot guarantee the kill order of its parent/child processes!", originalOomAdjust);
else
logger.LogWarning("oom_score_adj is at it's limit of 1000. TGS cannot guarantee the kill order of its parent/child processes!");
try
{