From 94938ed5b7ac770ad8a970c26684688238a7a7df Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Sun, 28 Jun 2026 21:32:47 -0400 Subject: [PATCH] Revert "I hate submodules. Why did it have to be submodules? (#6117)" This reverts commit d3b13a6c83da15df459636087e971f3efa6f0927. --- .github/workflows/build-docfx.yml | 9 --------- .github/workflows/build-map-renderer.yml | 10 +--------- .github/workflows/build-test-debug.yml | 8 -------- .github/workflows/publish.yml | 7 ------- .github/workflows/test-packaging.yml | 8 -------- .github/workflows/yaml-linter.yml | 8 -------- RobustToolbox | 2 +- 7 files changed, 2 insertions(+), 50 deletions(-) diff --git a/.github/workflows/build-docfx.yml b/.github/workflows/build-docfx.yml index 3a5f380becd..dee31e9b312 100644 --- a/.github/workflows/build-docfx.yml +++ b/.github/workflows/build-docfx.yml @@ -12,21 +12,12 @@ jobs: - name: Setup submodule run: | git submodule update --init --recursive - pushd RobustToolbox/Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 - name: Update Engine Submodules run: | cd RobustToolbox/ git submodule update --init --recursive - pushd Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 with: diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml index 067e6e0a4bb..04891d378f5 100644 --- a/.github/workflows/build-map-renderer.yml +++ b/.github/workflows/build-map-renderer.yml @@ -24,11 +24,7 @@ jobs: - name: Setup Submodule run: | git submodule update --init --recursive - pushd RobustToolbox/Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - + - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 @@ -36,10 +32,6 @@ jobs: run: | cd RobustToolbox/ git submodule update --init --recursive - pushd Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml index 7bfbb9b127a..961145ecb86 100644 --- a/.github/workflows/build-test-debug.yml +++ b/.github/workflows/build-test-debug.yml @@ -24,10 +24,6 @@ jobs: - name: Setup Submodule run: | git submodule update --init --recursive - pushd RobustToolbox/Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 @@ -36,10 +32,6 @@ jobs: run: | cd RobustToolbox/ git submodule update --init --recursive - pushd Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d3d3e128f79..3418834a81a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,7 +20,6 @@ jobs: - uses: actions/checkout@v4.2.2 with: submodules: 'recursive' - - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 with: @@ -31,12 +30,6 @@ jobs: cd RobustToolbox git fetch --depth=1 - - name: Get Engine Tag - run: | - cd RobustToolbox/Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - - name: Install dependencies run: dotnet restore diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml index 7399b58a3f2..490e31f7353 100644 --- a/.github/workflows/test-packaging.yml +++ b/.github/workflows/test-packaging.yml @@ -39,10 +39,6 @@ jobs: - name: Setup Submodule run: | git submodule update --init --recursive - pushd RobustToolbox/Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 @@ -51,10 +47,6 @@ jobs: run: | cd RobustToolbox/ git submodule update --init --recursive - pushd Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml index 8fc168317fc..ca925f4791d 100644 --- a/.github/workflows/yaml-linter.yml +++ b/.github/workflows/yaml-linter.yml @@ -17,20 +17,12 @@ jobs: - name: Setup submodule run: | git submodule update --init --recursive - pushd RobustToolbox/Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - name: Pull engine updates uses: space-wizards/submodule-dependency@v0.1.5 - name: Update Engine Submodules run: | cd RobustToolbox/ git submodule update --init --recursive - pushd Lidgren.Network/Lidgren.Network - git fetch - git checkout 726dd552a4b104fb2b701848705f1250a073f060 - popd - 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