From 0c07e542a7b8e560bfa3b71ce65e3c67e7860a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= <tiangolo@gmail.com>
Date: Sun, 27 Nov 2022 14:11:22 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Fix=20and=20tweak=20CI=20cache?=
 =?UTF-8?q?=20handling=20(#5696)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/publish.yml   |  2 ++
 .github/workflows/smokeshow.yml |  2 ++
 .github/workflows/test.yml      | 10 ++++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index fe4c5ee86c8c5..ab27d4b855d0d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -18,6 +18,8 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.7"
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
       - uses: actions/cache@v3
         id: cache
         with:
diff --git a/.github/workflows/smokeshow.yml b/.github/workflows/smokeshow.yml
index 7559c24c06228..55d64517f5a08 100644
--- a/.github/workflows/smokeshow.yml
+++ b/.github/workflows/smokeshow.yml
@@ -17,6 +17,8 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.9'
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
 
       - run: pip install smokeshow
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 85779af18b817..ddc43c942b558 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,13 +19,17 @@ jobs:
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
-        id: setup-python
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
           cache-dependency-path: pyproject.toml
+      - uses: actions/cache@v3
+        id: cache
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test-v03
       - name: Install Dependencies
-        if: steps.setup-python.outputs.cache-hit != 'true'
+        if: steps.cache.outputs.cache-hit != 'true'
         run: pip install -e .[all,dev,doc,test]
       - name: Lint
         run: bash scripts/lint.sh
@@ -50,6 +54,8 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.8'
+          cache: "pip"
+          cache-dependency-path: pyproject.toml
 
       - name: Get coverage files
         uses: actions/download-artifact@v3