From ccbf6e005d070ae1962bddfe15d575e90e8cea42 Mon Sep 17 00:00:00 2001
From: Tom French <tom@tomfren.ch>
Date: Fri, 15 Sep 2023 19:56:55 +0100
Subject: [PATCH 1/2] chore(ci): use `actions/setup-node` for caching yarn
 dependencies

---
 .github/actions/setup/action.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 5efe115ddcf..f0f6e3275bb 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -4,13 +4,14 @@ description: Installs the workspace's yarn dependencies and caches them
 runs:
   using: composite
   steps:
-    - name: Cache
-      uses: actions/cache@v3
-      id: cache
+    - uses: actions/setup-node@v3
+      id: node
       with:
-        path: "**/node_modules"
-        key: yarn-v1-${{ hashFiles('**/yarn.lock') }}
+        node-version: 18.17.1
+        cache: 'yarn'
+        cache-dependency-path: 'yarn.lock'
+    
     - name: Install
       run: yarn --immutable
       shell: bash
-      if: steps.cache.outputs.cache-hit != 'true'
+      if: steps.node.outputs.cache-hit != 'true'

From db06179690a95e70ee743221e6e8503d352d4334 Mon Sep 17 00:00:00 2001
From: Tom French <tom@tomfren.ch>
Date: Fri, 1 Dec 2023 10:57:54 +0000
Subject: [PATCH 2/2] chore: always run install step

---
 .github/actions/setup/action.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index f0f6e3275bb..8e24b6738a9 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -14,4 +14,3 @@ runs:
     - name: Install
       run: yarn --immutable
       shell: bash
-      if: steps.node.outputs.cache-hit != 'true'