Revert

lich0821 · Nov 21, 2024 · 9f51c38 · 9f51c38
1 parent 1af39e4
commit 9f51c38
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/.github/workflows/Build-WeChatFerry.yml b/.github/workflows/Build-WeChatFerry.yml
@@ -39,23 +39,16 @@ jobs:
           python -m pip install --upgrade pip
           pip install grpcio-tools==1.48.2
 
-      - name: 设置 vcpkg 缓存
-        id: cache-vcpkg-tools
+      - name: 设置缓存
+        id: cache-vcpkg
         uses: actions/cache@v4
         with:
-          path: C:/Tools/vcpkg
-          key: ${{ runner.os }}-vcpkg-tools-${{ hashFiles('WeChatFerry/vcpkg.json') }}
+          path: |
+            C:/Tools/vcpkg
+            ${{ github.workspace }}/WeChatFerry/vcpkg_installed
+          key: ${{ runner.os }}-vcpkg-${{ hashFiles('WeChatFerry/vcpkg.json') }}
           restore-keys: |
-            ${{ runner.os }}-vcpkg-tools-
-
-      - name: 设置 vcpkg_installed 缓存
-        id: cache-vcpkg-installed
-        uses: actions/cache@v4
-        with:
-          path: ${{ github.workspace }}/WeChatFerry/vcpkg_installed
-          key: ${{ runner.os }}-vcpkg-installed-${{ hashFiles('WeChatFerry/vcpkg.json') }}
-          restore-keys: |
-            ${{ runner.os }}-vcpkg-installed-
+            ${{ runner.os }}-vcpkg-
 
       - name: 安装 vcpkg 并初始化依赖项
         run: |
@@ -80,7 +73,7 @@ jobs:
 
           # 返回到项目目录并安装依赖
           cd ${{ github.workspace }}/WeChatFerry
-          C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static --x-install-root="${{ github.workspace }}/WeChatFerry/vcpkg_installed/x64-windows-static"
+          C:/Tools/vcpkg/vcpkg install --triplet x64-windows-static
 
       - name: 解析并构建配置
         run: |