Try to improve caching of GitHub Actions.

I saw caches getting restored, and then buildout still taking more than 15 minutes. I expect this is because we restore a cache with for example Python 3.7 eggs in a Python 3.9 job.
plone · Apr 14, 2022 · 422c0b1 · 422c0b1
1 parent ab37f0c
commit 422c0b1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/.github/workflows/bare.yml b/.github/workflows/bare.yml
@@ -31,8 +31,10 @@ jobs:
       with:
         path: |
           eggs
-        key: eggs-${{ hashFiles('versions*.cfg') }}
-        restore-keys: eggs-
+        key: eggs-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('versions*.cfg') }}
+        restore-keys: |
+          eggs-${{ matrix.python-version }}-${{ runner.os }}-
+          eggs-${{ matrix.python-version }}-
     - name: Run buildout
       run: |
         buildout -c bare.cfg buildout:git-clone-depth=1

diff --git a/.github/workflows/ecosystem.yml b/.github/workflows/ecosystem.yml
@@ -25,8 +25,10 @@ jobs:
       with:
         path: |
           eggs
-        key: eggs-${{ hashFiles('versions*.cfg') }}
-        restore-keys: eggs-
+        key: eggs-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('versions*.cfg') }}
+        restore-keys: |
+          eggs-${{ matrix.python-version }}-${{ runner.os }}-
+          eggs-${{ matrix.python-version }}-
     - name: Run buildout
       run: |
         buildout -c ecosystem.cfg buildout:git-clone-depth=1

diff --git a/.github/workflows/run-buildout.yml b/.github/workflows/run-buildout.yml
@@ -32,8 +32,10 @@ jobs:
       with:
         path: |
           eggs
-        key: eggs-${{ hashFiles('versions*.cfg') }}
-        restore-keys: eggs-
+        key: eggs-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('versions*.cfg') }}
+        restore-keys: |
+          eggs-${{ matrix.python-version }}-${{ runner.os }}-
+          eggs-${{ matrix.python-version }}-
     - name: Run buildout
       run: |
         buildout buildout:git-clone-depth=1
diff --git a/.github/workflows/versioncheck.yml b/.github/workflows/versioncheck.yml
@@ -30,8 +30,10 @@ jobs:
       with:
         path: |
           eggs
-        key: eggs-${{ hashFiles('versions*.cfg') }}
-        restore-keys: eggs-
+        key: eggs-${{ matrix.python-version }}-${{ runner.os }}-${{ hashFiles('versions*.cfg') }}
+        restore-keys: |
+          eggs-${{ matrix.python-version }}-${{ runner.os }}-
+          eggs-${{ matrix.python-version }}-
     - name: Run buildout
       run: |
         buildout buildout:git-clone-depth=1