From f1ec68704dd6202545bfc49f611f55f181816610 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sun, 12 Jun 2022 20:12:30 +0100
Subject: [PATCH] [CD] Cleanup pip cache in Win builds

- Use the more reliable setup-python cache
- Move the pip install to GTK install step for consistency
- Don't update pip to ensure consistent version
---
 .github/workflows/cd.yml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 35cd409c3..fe15ad4f0 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -46,19 +46,10 @@ jobs:
         with:
           python-version: ${{ matrix.python}}
           architecture: ${{ matrix.arch }}
-
-      - name: Cache pip
-        uses: actions/cache@v3
-        with:
-          path: '%LOCALAPPDATA%\pip\Cache'
-          # Look to see if there is a cache hit for the corresponding requirements file
-          key: ${{ runner.os }}-pip-${{ hashFiles('tox.ini', 'setup.py', 'requirements*.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
+          cache: pip
 
       - name: Prepare pip
-        run: python -m pip install --upgrade pip wheel
+        run: python -m pip install wheel
 
       - name: Install GTK
         run: |
@@ -68,11 +59,10 @@ jobs:
           echo "C:\GTK\release\lib" | Out-File -FilePath $env:GITHUB_PATH -Append
           echo "C:\GTK\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
           echo "C:\GTK\release" | Out-File -FilePath $env:GITHUB_PATH -Append
+          python -m pip install --no-index --find-links="C:\GTK\release\python" pycairo PyGObject
 
       - name: Install Python dependencies
         run: >
-          python -m pip install --no-index --find-links="C:\GTK\release\python" pycairo PyGObject
-
           python -m pip install
           twisted[tls]==22.4.0
           libtorrent==${{ matrix.libtorrent }}