CI: Ensure pnpm is installed before enabling setup-node pnpm cache (lint and site jobs)

Author: ndbroadbent

.github/workflows/deploy-site.yml

@@ -39,14 +39,19 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: '20'
-          cache: 'pnpm'
-          cache-dependency-path: 'site/pnpm-lock.yaml'
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
           version: latest
 
+      - name: Enable pnpm cache
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'pnpm'
+          cache-dependency-path: 'site/pnpm-lock.yaml'
+
       - name: Install site dependencies
         run: |
           cd site && pnpm install --frozen-lockfile

.github/workflows/test.yml

@@ -25,16 +25,21 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: pnpm
-          cache-dependency-path: |
-            pnpm-lock.yaml
-            site/pnpm-lock.yaml
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
           version: latest
 
+      - name: Enable pnpm cache
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: |
+            pnpm-lock.yaml
+            site/pnpm-lock.yaml
+
       - name: Install npm packages
         run: |
           # Install root and site pnpm dependencies
@@ -97,14 +102,19 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: pnpm
-          cache-dependency-path: site/pnpm-lock.yaml
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
           version: latest
 
+      - name: Enable pnpm cache (site)
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: site/pnpm-lock.yaml
+
       - name: Install site dependencies
         run: cd site && pnpm install --frozen-lockfile