From e4997a27ff946a9e267f37632db9c3ca1234090f Mon Sep 17 00:00:00 2001
From: Jirka Borovec <6035284+Borda@users.noreply.github.com>
Date: Thu, 2 Feb 2023 19:36:33 +0900
Subject: [PATCH] ci: simplify cashing (#16599)

---
 .github/workflows/ci-examples-app.yml  |  5 +++--
 .github/workflows/ci-tests-app.yml     |  5 +++--
 .github/workflows/ci-tests-fabric.yml  |  6 +++---
 .github/workflows/ci-tests-pytorch.yml |  6 +++---
 .github/workflows/code-checks.yml      |  6 +++---
 .github/workflows/docs-checks.yml      | 10 ++++------
 .github/workflows/docs-deploy.yml      |  5 ++---
 7 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci-examples-app.yml b/.github/workflows/ci-examples-app.yml
index d10a0b4e8e..b3269bb2df 100644
--- a/.github/workflows/ci-examples-app.yml
+++ b/.github/workflows/ci-examples-app.yml
@@ -71,8 +71,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.requires }}-${{ hashFiles('requirements/app/base.txt') }}
-          restore-keys: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.requires }}-
+          key: pip-${{ matrix.pkg-name }}-${{ matrix.requires }}-${{ hashFiles('requirements/app/base.txt') }}
+          restore-keys: pip-${{ matrix.pkg-name }}-
+          enableCrossOsArchive: true
 
       - name: Install Lightning package & dependencies
         env:
diff --git a/.github/workflows/ci-tests-app.yml b/.github/workflows/ci-tests-app.yml
index 8324506342..0071370545 100644
--- a/.github/workflows/ci-tests-app.yml
+++ b/.github/workflows/ci-tests-app.yml
@@ -69,8 +69,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.requires }}-${{ hashFiles('requirements/app/base.txt') }}
-          restore-keys: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.requires }}-
+          key: pip-${{ matrix.pkg-name }}-${{ matrix.requires }}-${{ hashFiles('requirements/app/base.txt') }}
+          restore-keys: pip-${{ matrix.pkg-name }}-
+          enableCrossOsArchive: true
 
       - name: Switch PyTorch URL
         run: python -c "print('TORCH_URL=https://download.pytorch.org/whl/' + str('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html'))" >> $GITHUB_ENV
diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml
index 9c7301121f..06c81806d8 100644
--- a/.github/workflows/ci-tests-fabric.yml
+++ b/.github/workflows/ci-tests-fabric.yml
@@ -93,9 +93,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.release }}-${{ matrix.requires }}-${{ hashFiles('requirements/fabric/*.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.release }}-${{ matrix.requires }}-
+        key: pip-${{ matrix.pkg-name }}-${{ matrix.release }}-${{ matrix.requires }}-${{ hashFiles('requirements/fabric/*.txt') }}
+        restore-keys: pip-${{ matrix.pkg-name }}-${{ matrix.release }}-
+        enableCrossOsArchive: true
 
     - name: Switch PyTorch URL
       run: python -c "print('TORCH_URL=https://download.pytorch.org/whl/' + str('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html'))" >> $GITHUB_ENV
diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml
index e2dd46fa0c..fd9ee44f5d 100644
--- a/.github/workflows/ci-tests-pytorch.yml
+++ b/.github/workflows/ci-tests-pytorch.yml
@@ -106,9 +106,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ${{ steps.pip-cache.outputs.dir }}
-        key: ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.release }}-${{ matrix.requires }}-${{ hashFiles('requirements/pytorch/*.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-py${{ matrix.python-version }}-${{ matrix.pkg-name }}-${{ matrix.release }}-${{ matrix.requires }}-
+        key: pip-${{ matrix.pkg-name }}-${{ matrix.release }}-${{ matrix.requires }}-${{ hashFiles('requirements/pytorch/*.txt') }}
+        restore-keys: pip-${{ matrix.pkg-name }}-${{ matrix.release }}-
+        enableCrossOsArchive: true
 
     - name: Env. variables
       run: |
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
index 2741f55aac..54d37c11c4 100644
--- a/.github/workflows/code-checks.yml
+++ b/.github/workflows/code-checks.yml
@@ -40,9 +40,9 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('requirements/pytorch/base.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
+        key: pip-${{ hashFiles('requirements/pytorch/base.txt') }}
+        restore-keys: pip-
+        enableCrossOsArchive: true
 
     - name: Install dependencies
       run: |
diff --git a/.github/workflows/docs-checks.yml b/.github/workflows/docs-checks.yml
index 6a3cf54d40..dbd356e33d 100644
--- a/.github/workflows/docs-checks.yml
+++ b/.github/workflows/docs-checks.yml
@@ -60,9 +60,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-docs-test-${{ matrix.pkg-name }}-${{ hashFiles('requirements/${{ matrix.pkg-name }}/*.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-docs-test-${{ matrix.pkg-name }}-
+          key: docs-test-${{ matrix.pkg-name }}-${{ hashFiles('requirements/${{ matrix.pkg-name }}/*.txt') }}
+          restore-keys: docs-test-${{ matrix.pkg-name }}-
 
       - name: Install LAI package
         # This is needed as App docs is heavily using/referring to lightning package
@@ -125,9 +124,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-docs-make-${{ matrix.pkg-name }}-${{ hashFiles('requirements/${{ matrix.pkg-name }}/*.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-docs-make-${{ matrix.pkg-name }}-
+          key: docs-make-${{ matrix.pkg-name }}-${{ hashFiles('requirements/${{ matrix.pkg-name }}/*.txt') }}
+          restore-keys: docs-make-${{ matrix.pkg-name }}-
 
       - name: Install package & dependencies
         env:
diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
index b6f10d419c..d705896b77 100644
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -39,9 +39,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-deploy-docs-pip-${{ hashFiles('requirements/app/*.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-deploy-docs-pip-
+          key: deploy-docs-pip-${{ hashFiles('requirements/app/*.txt') }}
+          restore-keys: deploy-docs-pip-
 
       - name: Install package & dependencies
         env: