From 3e334ebb915f9c69e5ea14eb1aeb0e84adecdd01 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 29 Oct 2020 22:31:28 +0000
Subject: [PATCH] chore(deps): update actions/cache action to v2 (#8228)

* chore(deps): update actions/cache action to v2

* use relative and multiple paths for actions/cache

Co-authored-by: Clark Du <clark.duxin@gmail.com>
---
 .github/workflows/test.yml    | 73 ++++++++++++++++++++++++-----------
 .github/workflows/windows.yml | 29 +++++++++-----
 2 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3af9f6a706..713c44c2e3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
 
       - name: cache node_modules
         id: node_modules_cache_id
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
@@ -45,9 +45,12 @@ jobs:
         run: yarn --check-files --frozen-lockfile --non-interactive
 
       - name: cache workspace
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
   lint:
@@ -67,9 +70,12 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: lint
@@ -96,9 +102,12 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: audit
@@ -123,9 +132,12 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: test unit
@@ -160,16 +172,19 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: build
         run: yarn test:fixtures -i
 
       - name: cache fixtures
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: test/fixtures
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -192,13 +207,16 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: restore fixtures
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: test/fixtures
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -225,13 +243,16 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: restore fixtures
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: test/fixtures
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -258,13 +279,16 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: restore fixtures
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: test/fixtures
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -283,9 +307,12 @@ jobs:
 
     steps:
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - uses: actions/setup-node@v1
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f9faadf285..d58b6e5886 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -30,7 +30,7 @@ jobs:
 
       - name: cache node_modules
         id: node_modules_cache_id
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
@@ -39,9 +39,12 @@ jobs:
         run: yarn --check-files --frozen-lockfile --non-interactive
 
       - name: cache workspace
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
 
@@ -68,7 +71,7 @@ jobs:
   #     - name: restore workspace cache
   #       uses: actions/cache@v1
   #       with:
-  #         path: ${{ github.workspace }}
+  #         path: ./**/node_modules
   #         key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
   #     - name: test unit
@@ -101,16 +104,19 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: build
         run: yarn test:fixtures -i
 
       - name: cache fixtures
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: test/fixtures
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}
@@ -136,13 +142,16 @@ jobs:
         uses: actions/checkout@master
 
       - name: restore workspace cache
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ${{ github.workspace }}
+          path: |
+            node_modules
+            packages/*/node_modules
+            packages/*/dist
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-nuxt-${{ github.sha }}
 
       - name: restore fixtures
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: test/fixtures
           key: ${{ matrix.os }}-node-v${{ matrix.node }}-fixtures-${{ github.sha }}