From e3fe9b5c42fb17429f7cbac2d50cdf08d6ff5c17 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 3 Mar 2024 21:31:05 -0500 Subject: [PATCH 1/3] Version bump to 6.4.0 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Version.props b/build/Version.props index bd546a1cd3..391a9e4ec8 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 6.3.2 + 6.4.0 5.1.0 10.2.0 7.0.0 From 9b54ea7c4d75a0c7d7930991c6ed41e0362fad71 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 3 Mar 2024 23:53:11 -0500 Subject: [PATCH 2/3] Fix `CI Completion` check not being created for the right SHA --- .github/workflows/ci-pipeline.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index d136649c08..61a7d50a23 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -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: From 4a5610ce14195c532d02471de0b6e7461f43f9d8 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Mon, 4 Mar 2024 14:14:16 -0500 Subject: [PATCH 3/3] Fix incorrect warning on Linux --- src/Tgstation.Server.Host/System/PosixProcessFeatures.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Tgstation.Server.Host/System/PosixProcessFeatures.cs b/src/Tgstation.Server.Host/System/PosixProcessFeatures.cs index 9d97d20be5..f9894e9ac9 100644 --- a/src/Tgstation.Server.Host/System/PosixProcessFeatures.cs +++ b/src/Tgstation.Server.Host/System/PosixProcessFeatures.cs @@ -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 {