From ecd81e5f73adf6fef6fc0067f50d088a51c32f6a Mon Sep 17 00:00:00 2001
From: Peter Bengtsson <mail@peterbe.com>
Date: Fri, 12 Mar 2021 12:48:57 -0500
Subject: Revert "fix caching" (#121)

* Revert "fix caching"

* trivial change

* correct the path

* trivial change

* trivial change

* other files too
---
 .github/workflows/pr-check_redirects.yml      | 17 ++++++--------
 .github/workflows/pr-test.yml                 | 32 ++++++++++-----------------
 .github/workflows/sync-translated-content.yml | 19 +++++++---------
 3 files changed, 27 insertions(+), 41 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/pr-check_redirects.yml b/.github/workflows/pr-check_redirects.yml
index 43b7f6e50f..02bd442498 100644
--- a/.github/workflows/pr-check_redirects.yml
+++ b/.github/workflows/pr-check_redirects.yml
@@ -26,19 +26,16 @@ jobs:
         with:
           node-version: "12"
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2.1.4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+      - name: Cache node_modules
+        uses: actions/cache@v2.1.4
+        id: cached-node_modules
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          path: |
+            ${{ github.workspace }}/mdn/content/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install all yarn packages
+        if: steps.cached-node_modules.outputs.cache-hit != 'true'
         working-directory: ${{ github.workspace }}/mdn/content
         run: |
           yarn --frozen-lockfile
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index be61826133..cc088b8604 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -1,13 +1,8 @@
-# Note that this workflow uses `get-diff-action` which is important.
-# It gives us an environment variable called `GIT_DIFF` which is a string
-# that is a list of file paths.
-# If you want to do what this workflow does on your laptop you can simulate
-# it like this:
-#
-#    export GIT_DIFF=`git diff --name-only main... | grep 'files/' | grep '\.html$'`
-#    node content build --no-progressbar --files="${GIT_DIFF}"
-#
-# That way, you can behave on your laptop like, this action behaves here.
+# This is more or less a copy of
+# https://github.com/mdn/content/blob/main/.github/workflows/pr-test.yml
+# but done in a way that it first checks out mdn/translated-content (or
+# fork of) and _then_ checks out mdn/content which has the relevant
+# CI related tooling.
 
 name: PR Test
 
@@ -33,19 +28,16 @@ jobs:
         with:
           node-version: "12"
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2.1.4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+      - name: Cache node_modules
+        uses: actions/cache@v2.1.4
+        id: cached-node_modules
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          path: |
+            ${{ github.workspace }}/mdn/content/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install all yarn packages
+        if: steps.cached-node_modules.outputs.cache-hit != 'true'
         working-directory: ${{ github.workspace }}/mdn/content
         run: |
           yarn --frozen-lockfile
diff --git a/.github/workflows/sync-translated-content.yml b/.github/workflows/sync-translated-content.yml
index f47e7f6e5c..ab5cbd40c0 100644
--- a/.github/workflows/sync-translated-content.yml
+++ b/.github/workflows/sync-translated-content.yml
@@ -28,19 +28,16 @@ jobs:
         with:
           node-version: "12"
 
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2.1.4
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+      - name: Cache node_modules
+        uses: actions/cache@v2.1.4
+        id: cached-node_modules
         with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          path: |
+            ${{ github.workspace }}/mdn/content/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install all yarn packages
+        if: steps.cached-node_modules.outputs.cache-hit != 'true'
         working-directory: ${{ github.workspace }}/mdn/content
         run: |
           yarn --frozen-lockfile
@@ -53,7 +50,7 @@ jobs:
         run: |
           yarn content sync-translated-content
 
-      - name: Commit changes 
+      - name: Commit changes
         # git commit will fail if there are no changes but that's okay!
         continue-on-error: true
         run: |
-- 
cgit v1.2.3-54-g00ecf