From cb956f605f98f4ae070f0708b4a279236ae2e7e7 Mon Sep 17 00:00:00 2001 From: pathetic meowmeow Date: Mon, 29 Jun 2026 07:43:52 -0400 Subject: [PATCH] Use the actual backported engine fix (#6138) * Revert "I hate submodules. Why did it have to be submodules? (#6117)" This reverts commit d3b13a6c83da15df459636087e971f3efa6f0927. * from one workaround to another --------- Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com> --- .github/workflows/build-test-debug.yml | 1 + .github/workflows/publish.yml | 1 + .github/workflows/yaml-linter.yml | 1 + RobustToolbox | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 961145ecb86..d5734de38fb 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -32,6 +32,7 @@ jobs: run: | cd RobustToolbox/ git submodule update --init --recursive + rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3418834a81a..4aa40732b21 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,6 +29,7 @@ jobs: run: | cd RobustToolbox git fetch --depth=1 + rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index ca925f4791d..3b1f91b48b2 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -23,6 +23,7 @@ jobs: run: | cd RobustToolbox/ git submodule update --init --recursive + rm Robust.Shared.Tests/Networking/NetEncryptionDoSTest.cs # DeltaV - work around bug in the backport - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 with: diff --git a/RobustToolbox b/RobustToolbox index 68f8d00931d..645c0fc2e44 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 68f8d00931d6b14f3e592d50c47dd44ef09eed1f +Subproject commit 645c0fc2e44df46e0434ab39bb1c223d50f9e383