From d4886eb5e4744d546edc4f511789704b716a4b8d Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Tue, 26 Mar 2024 20:35:02 -0400
Subject: [PATCH 1/4] Fix chat help commands not working
---
src/Tgstation.Server.Host/Components/Chat/ChatManager.cs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
index d53e997b256..049c217efb3 100644
--- a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
@@ -839,7 +839,7 @@ ValueTask TextReply(string reply) => SendMessage(
splits.RemoveAt(0);
var arguments = String.Join(" ", splits);
- Tuple<ICommand, IChatTrackingContext?>? GetCommand()
+ Tuple<ICommand, IChatTrackingContext?>? GetCommand(string command)
{
if (!builtinCommands.TryGetValue(command, out var handler))
return trackingContexts
@@ -867,7 +867,7 @@ ValueTask TextReply(string reply) => SendMessage(
}
else
{
- var helpTuple = GetCommand();
+ var helpTuple = GetCommand(splits[0]);
if (helpTuple != default)
{
var (helpHandler, _) = helpTuple;
@@ -881,7 +881,7 @@ ValueTask TextReply(string reply) => SendMessage(
return;
}
- var tuple = GetCommand();
+ var tuple = GetCommand(command);
if (tuple == default)
{
From 1f89791ff150cf1e18a830e00ded1cc842bd8bc3 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Tue, 26 Mar 2024 20:35:47 -0400
Subject: [PATCH 2/4] Version bump to 6.4.1
---
build/Version.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/Version.props b/build/Version.props
index 391a9e4ec86..56b991f7d33 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.4.0</TgsCoreVersion>
+ <TgsCoreVersion>6.4.1</TgsCoreVersion>
<TgsConfigVersion>5.1.0</TgsConfigVersion>
<TgsApiVersion>10.2.0</TgsApiVersion>
<TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>
From 19c856b2a53fdceb1fee562e78c8985b473cf996 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 28 Mar 2024 09:22:35 -0400
Subject: [PATCH 3/4] Add name to rerun-flaky-tests job
---
.github/workflows/rerun-flaky-tests.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/rerun-flaky-tests.yml b/.github/workflows/rerun-flaky-tests.yml
index 2a18960a1c5..522e1120cca 100644
--- a/.github/workflows/rerun-flaky-tests.yml
+++ b/.github/workflows/rerun-flaky-tests.yml
@@ -6,6 +6,7 @@ on:
- completed
jobs:
rerun_flaky_tests:
+ name: Rerun Flaky Tests
runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.run_attempt == 1 }}
steps:
From 27b5499fbb2bb9c1a8a5de3b45c8e3c82c7df7d5 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 28 Mar 2024 09:23:24 -0400
Subject: [PATCH 4/4] Add missing package.json
---
.github/workflows/scripts/package.json | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .github/workflows/scripts/package.json
diff --git a/.github/workflows/scripts/package.json b/.github/workflows/scripts/package.json
new file mode 100644
index 00000000000..bedb411a912
--- /dev/null
+++ b/.github/workflows/scripts/package.json
@@ -0,0 +1,3 @@
+{
+ "type": "module"
+}