From edf222f297dbe57782f46fd6d38dd7c92d59e3fe Mon Sep 17 00:00:00 2001
From: chu fan <fairy_408@2925.com>
Date: Sat, 9 Sep 2023 00:45:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DCI/CD=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E7=BA=BF=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/CD.yaml | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml
index f2849ef..623e027 100644
--- a/.github/workflows/CD.yaml
+++ b/.github/workflows/CD.yaml
@@ -44,15 +44,10 @@ jobs:
       - name: Cache Dependencies
         uses: actions/cache@v3
         with:
-          path: node_modules
+          path: |
+            node_modules
           key: ${{ runner.os }}-node_modules-${{ hashFiles('**/pnpm-lock.yaml') }}
 
-      - name: Cache PNPM
-        uses: actions/cache@v3
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
-
   ## 部署到Github-Pages
   deploy-github:
     name: "部署到Github-Pages"
@@ -68,7 +63,8 @@ jobs:
       - name: Restore Dependencies From cache
         uses: actions/cache@v3
         with:
-          path: node_modules
+          path: |
+            node_modules
           key: ${{ runner.os }}-node_modules-${{ hashFiles('**/pnpm-lock.yaml') }}
 
 
@@ -99,20 +95,16 @@ jobs:
       - name: Restore Dependencies From Cache
         uses: actions/cache@v3
         with:
-          path: node_modules
+          path: |
+            node_modules
           key: ${{ runner.os }}-node_modules-${{ hashFiles('**/pnpm-lock.yaml') }}
 
-      - name: Restore PNPM From Cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
-
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
 
+      ## 注意：安装pnpm
       - name: Build Project Artifacts
-        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
+        run: npm i pnpm@7 -g && vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
 
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
@@ -129,8 +121,12 @@ jobs:
       - name: Restore Dependencies From cache
         uses: actions/cache@v3
         with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/pnpm-lock.yaml') }}
+          path: |
+            ~/.pnpm-store
+            node_modules
+          key: ${{ runner.os }}-cache-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-cache-
 
       ### 打成压缩包
       - name: Create Zip Package