From ac62bb7b84079fa484dd469b355e24aef326febe Mon Sep 17 00:00:00 2001
From: Mike Fiedler <miketheman@gmail.com>
Date: Wed, 15 Jun 2022 09:14:32 -0400
Subject: [PATCH] chore: replace custom cache step with config (#11572)

* chore: replace custom cache step with config

The `actions/setup-python@v2` and higher included a built-in cache
restore and post-run save step, meaning we can now retire our custom
steps for the configuration we want and gain some speed here.

Refs: https://github.com/actions/setup-python/pull/266
Refs: https://github.com/actions/setup-python#caching-packages-dependencies

Signed-off-by: Mike Fiedler <miketheman@gmail.com>

* chore: replace custom cache step with config

The `actions/setup/node@v2` introduced support for configuring cache for
npm.
Since we use defaults, no changes are necessary other than setting the
installer type.

Refs: https://github.com/actions/setup-node/pull/272

Signed-off-by: Mike Fiedler <miketheman@gmail.com>
---
 .github/workflows/ci.yml | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bfb7e5142622..0d660de54f2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,18 +68,10 @@ jobs:
         if: ${{ matrix.needs-python }}
         with:
           python-version-file: '.python-version'
-      - name: Cache Python dependencies
-        if: ${{ matrix.needs-python }}
-        uses: actions/cache@v3
-        env:
-          cache-name: warehouse-cache-pip
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('requirements.txt', 'requirements/*.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-
-            ${{ runner.os }}-${{ github.job }}-
-            ${{ runner.os }}-
+          cache: 'pip'
+          cache-dependency-path: |
+            requirements.txt
+            requirements/*.txt
       - name: Install Python dependencies
         if: ${{ matrix.needs-python }}
         run: |
@@ -90,19 +82,7 @@ jobs:
         if: ${{ matrix.needs-node }}
         with:
           node-version: 14.15.5
-      - name: Cache Node dependencies
-        if: ${{ matrix.needs-node }}
-        uses: actions/cache@v2
-        env:
-          cache-name: warehouse-cache-npm
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ github.job }}-${{ env.cache-name }}-
-            ${{ runner.os }}-build-${{ github.job }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+          cache: 'npm'
       - name: Install Node dependencies
         if: ${{ matrix.needs-node }}
         run: npm ci