From 43d56d558e75d62549b9ec6b3f4ce59de251aad5 Mon Sep 17 00:00:00 2001
From: Jeffrey Posnick <jeffy@google.com>
Date: Fri, 3 Sep 2021 13:05:34 -0400
Subject: [PATCH] Update to cache@v2 (#2935)

---
 .github/workflows/pull-request.yml | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index b201a7bb7..6c1bbc37e 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -9,17 +9,21 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/cache@v1
+      - uses: actions/setup-node@v1
         with:
-          path: ~/.npm
+          node-version: 10.x
+
+      - name: Get npm cache directory
+        id: npm-cache
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10.x
-
       - name: Setup
         run: |
           npm ci
@@ -33,22 +37,22 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/cache@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+
+      - uses: actions/cache@v2
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-node-
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v2
         with:
           path: ~/.selenium-assistant
           key: ${{ runner.os }}
 
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-
       - name: Setup
         run: |
           sudo safaridriver --enable