From 322915daf20d9ef48e3a0e07ed0093ba95f17f47 Mon Sep 17 00:00:00 2001
From: Core <core@coredev.uk>
Date: Sat, 5 Nov 2022 00:09:54 +0000
Subject: [PATCH] Reverted to previous caching method (setup-node says no)

---
 .github/workflows/cider-chores.yml | 23 ++++-------------------
 .github/workflows/dev-chores.yml   | 24 +++++-------------------
 2 files changed, 9 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/cider-chores.yml b/.github/workflows/cider-chores.yml
index a3b4b139..5ae252fd 100644
--- a/.github/workflows/cider-chores.yml
+++ b/.github/workflows/cider-chores.yml
@@ -23,12 +23,6 @@ jobs:
           # Make sure the actual branch is checked out when running on pull requests
           ref: ${{ github.head_ref }}
 
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: "pnpm"
-
       - uses: pnpm/action-setup@v2
         name: Setup pnpm 🚧
         id: pnpm-install
@@ -36,20 +30,11 @@ jobs:
           version: 7
           run_install: false
 
-      - name: Get pnpm store directory ⌨️
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v3
-        name: Setup cache 🔒
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
         with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
+          node-version: ${{ matrix.node-version }}
+          cache: "pnpm"
 
       - name: Update lockfile
         run: pnpm update
diff --git a/.github/workflows/dev-chores.yml b/.github/workflows/dev-chores.yml
index 146668e6..f38179ab 100644
--- a/.github/workflows/dev-chores.yml
+++ b/.github/workflows/dev-chores.yml
@@ -15,13 +15,6 @@ jobs:
         - name: Checkout 🛎
           uses: actions/checkout@v3
 
-        - name: Setup node env 🏗
-          uses: actions/setup-node@v3
-          with:
-            node-version: ${{ matrix.node }}
-            check-latest: true
-            cache: 'pnpm'
-
         - uses: pnpm/action-setup@v2
           name: Setup pnpm 🚧
           id: pnpm-install
@@ -29,19 +22,12 @@ jobs:
             version: 7
             run_install: false
 
-        - name: Get pnpm store directory ⌨️
-          id: pnpm-cache
-          shell: bash
-          run: |
-            echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-        - uses: actions/cache@v3
-          name: Setup cache 🔒
+        - name: Setup node env 🏗
+          uses: actions/setup-node@v3
           with:
-            path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-            key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-            restore-keys: |
-              ${{ runner.os }}-pnpm-store-
+            node-version: ${{ matrix.node }}
+            check-latest: true
+            cache: 'pnpm'
 
         - name: Install dependencies 👨🏻‍💻
           run: pnpm install