fix caching

.github/workflows/pr-check_redirects.yml

@@ -29,6 +29,7 @@ jobs:
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - uses: actions/[email protected]
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:

.github/workflows/pr-test.yml

@@ -33,16 +33,19 @@ jobs:
         with:
           node-version: "12"
 
-      - name: Cache node_modules
-        uses: actions/[email protected]
-        id: cached-node_modules
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/[email protected]
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
-          path: |
-            {{ github.workspace }}/mdn/content/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}-1
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
 
       - name: Install all yarn packages
-        if: steps.cached-node_modules.outputs.cache-hit != 'true'
         working-directory: ${{ github.workspace }}/mdn/content
         run: |
           yarn --frozen-lockfile

.github/workflows/sync-translated-content.yml

@@ -28,16 +28,19 @@ jobs:
         with:
           node-version: "12"
 
-      - name: Cache node_modules
-        uses: actions/[email protected]
-        id: cached-node_modules
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/[email protected]
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
-          path: |
-            **/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
 
       - name: Install all yarn packages
-        if: steps.cached-node_modules.outputs.cache-hit != 'true'
         working-directory: ${{ github.workspace }}/mdn/content
         run: |
           yarn --frozen-lockfile