SDK and Network as submodules

.github/workflows/update-sdk.yml

@@ -9,14 +9,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Clone server repository
-        uses: actions/checkout@v3
-        with:
-          clean: true
-          path: "Server"
-          submodules: recursive
-          token: ${{ secrets.CI_TOKEN }}
-
       - name: Clone SDK repository
         uses: actions/checkout@v3
         with:
@@ -27,30 +19,16 @@ jobs:
           submodules: recursive
           token: ${{ secrets.CI_TOKEN }}
 
-      - name: Update SDK files from server repository
+      - name: Update SDK files from dev branch
         if: always()
         shell: bash
         run: |
-          rm -rf ./SDK/include/*
-          mv -f ./Server/SDK/include ./SDK
-          cd SDK
-          git config user.name open.mp
-          git config user.email [email protected]
-          git add .
-          git commit -m "Update SDK" -m "with https://github.com/openmultiplayer/open.mp/commit/${{ github.sha }}" || true
+          git rebase dev
           git push || true
 
   update-network:
     runs-on: ubuntu-latest
     steps:
-      - name: Clone server repository
-        uses: actions/checkout@v3
-        with:
-          clean: true
-          path: "Server"
-          submodules: recursive
-          token: ${{ secrets.CI_TOKEN }}
-
       - name: Clone Network repository
         uses: actions/checkout@v3
         with:
@@ -61,15 +39,9 @@ jobs:
           submodules: recursive
           token: ${{ secrets.CI_TOKEN }}
 
-      - name: Update Network files from server repository
+      - name: Update Network files from dev branch
         if: always()
         shell: bash
         run: |
-          rm -rf ./Network/*
-          mv -f ./Server/Shared/Network/* ./Network
-          cd Network
-          git config user.name open.mp
-          git config user.email [email protected]
-          git add .
-          git commit -m "Update Network" -m "with https://github.com/openmultiplayer/open.mp/commit/${{ github.sha }}" || true
+          git rebase dev
           git push || true

.gitmodules

@@ -16,15 +16,9 @@
 [submodule "lib/cmake-conan"]
 	path = lib/cmake-conan
 	url = https://github.com/openmultiplayer/cmake-conan.git
-[submodule "SDK/lib/glm"]
-	path = SDK/lib/glm
-	url = https://github.com/g-truc/glm
-[submodule "SDK/lib/robin-hood-hashing"]
-	path = SDK/lib/robin-hood-hashing
-	url = https://github.com/martinus/robin-hood-hashing
-[submodule "SDK/lib/span-lite"]
-	path = SDK/lib/span-lite
-	url = https://github.com/martinmoene/span-lite
-[submodule "SDK/lib/string-view-lite"]
-	path = SDK/lib/string-view-lite
-	url = https://github.com/martinmoene/string-view-lite
+[submodule "SDK"]
+	path = SDK
+	url = https://github.com/openmultiplayer/open.mp-sdk
+[submodule "Shared/Network"]
+	path = Shared/Network
+	url = https://github.com/openmultiplayer/open.mp-network