refactor: 集成 MaaUtils (#14578)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -117,6 +117,7 @@ jobs:
 
       - name: Fetch submodules
         run: |
+          git submodule update --init --depth 1 src/MaaUtils
           git submodule update --init --depth 1 3rdparty/EmulatorExtras
 
       - name: Cache MaaDeps
@@ -124,7 +125,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ./MaaDeps
+            ./src/MaaUtils/MaaDeps
           key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps
@@ -225,6 +226,7 @@ jobs:
 
       - name: Fetch submodules
         run: |
+          git submodule update --init --depth 1 src/MaaUtils
           git submodule update --init --depth 1 3rdparty/EmulatorExtras
           git submodule update --init --depth 1 src/maa-cli
 
@@ -232,7 +234,7 @@ jobs:
         id: cache-maadeps
         uses: actions/cache@v4
         with:
-          path: ./MaaDeps
+          path: ./src/MaaUtils/MaaDeps
           key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps
@@ -251,7 +253,7 @@ jobs:
             -DINSTALL_RESOURCE=ON \
             -DINSTALL_PYTHON=ON \
             -DMAA_HASH_VERSION='${{ needs.meta.outputs.tag }}' \
-            -DCMAKE_TOOLCHAIN_FILE=MaaDeps/cmake/maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux-toolchain.cmake
+            -DCMAKE_TOOLCHAIN_FILE=src/MaaUtils/MaaDeps/cmake/maa-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-linux-toolchain.cmake
 
       - name: Build
         run: |
@@ -348,6 +350,10 @@ jobs:
         with:
           show-progress: false
 
+      - name: Fetch submodules
+        run: |
+          git submodule update --init --depth 1 src/MaaUtils
+
       # ninja 1.13.1 is already installed and up-to-date.
       # - name: Install dependencies
       #   run: |
@@ -357,13 +363,12 @@ jobs:
         id: cache-maadeps
         uses: actions/cache@v4
         with:
-          path: ./MaaDeps
+          path: ./src/MaaUtils/MaaDeps
           key: ${{ runner.os }}-${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps
         run: |
-          [[ ${{ matrix.arch }} = "arm64" ]] && triplet="arm64-osx" || triplet="x64-osx"
-          python3 tools/maadeps-download.py ${triplet}
+          python3 tools/maadeps-download.py ${{ matrix.arch == 'x86_64' && 'x64' || 'arm64' }}-osx
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/release-nightly-ota.yml

@@ -53,6 +53,7 @@ jobs:
 
       - name: Fetch submodules
         run: |
+          git submodule update --init --depth 1 src/MaaUtils
           git submodule update --init --depth 1 3rdparty/EmulatorExtras
 
       - name: Checkout ref (if provided)
@@ -173,7 +174,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ./MaaDeps
+            ./src/MaaUtils/MaaDeps
           key: ${{ runner.os }}-${{ matrix.arch }}-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps

.github/workflows/res-update-game.yml

@@ -144,6 +144,10 @@ jobs:
           show-progress: false
           fetch-depth: 3
 
+      - name: Fetch submodules
+        run: |
+          git submodule update --init --depth 1 src/MaaUtils
+
       - name: Restore ResourceUpdater from cache
         id: resupd-cache
         uses: actions/cache/restore@v4
@@ -159,7 +163,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ./MaaDeps
+            ./src/MaaUtils/MaaDeps
           key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps

.github/workflows/smoke-testing.yml

@@ -63,14 +63,14 @@ jobs:
       - name: Fetch submodules
         if: steps.smoke-cache.outputs.cache-hit != 'true'
         run: |
-          git submodule update --init --depth 1 3rdparty/EmulatorExtras
+          git submodule update --init --depth 1 src/MaaUtils
 
       - name: Cache MaaDeps
         if: steps.smoke-cache.outputs.cache-hit != 'true'
         id: maadeps-cache
         uses: actions/cache@v4
         with:
-          path: ./MaaDeps
+          path: ./src/MaaUtils/MaaDeps
           key: ${{ runner.os }}-arm64-maadeps-${{ hashFiles('tools/maadeps-download.py') }}
 
       - name: Bootstrap MaaDeps