optimize cache in CI

GeotrekCE · Jan 30, 2023 · d1dd2a2 · d1dd2a2
1 parent ddecf09
commit d1dd2a2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -12,25 +12,29 @@ permissions:
 jobs:
   quality:
     name: Checking dependency graph
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ['ubuntu-20.04']
+        python-version: ['3.8']
 
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Python 3.8
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8  # lint with minimal version supported (3.8 in 18.04)
+          python-version: ${{ matrix.python-version }}
 
       - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/pip
             ~/.wheel_dir
 
-          key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+          key: ${{ matrix.os }}-pip-${{ matrix.python-version }}
           restore-keys: |
-            ${{ runner.os }}-pip-${{ matrix.python-version }}
+            ${{ matrix.os }}-pip-${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,7 +17,11 @@ permissions:
 jobs:
   quality:
     name: Checking dependency graph and code quality
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ['ubuntu-20.04']
+        python-version: ['3.8']
 
     steps:
       - uses: actions/checkout@v3
@@ -27,10 +31,10 @@ jobs:
           test $(ls geotrek/*/migrations/*.py | xargs grep -l srid | xargs grep -L SRID | wc -l) -eq 0
 
 
-      - name: Set up Python 3.8
+      - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8  # lint with minimal version supported (3.8 in 18.04)
+          python-version: ${{ matrix.python-version }}
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -83,9 +83,9 @@ jobs:
           ~/.cache/pip
           ~/.wheel_dir
 
-        key: ${{ runner.os }}-pip-${{ matrix.python-version }}
+        key: ${{ matrix.os }}-pip-${{ matrix.python-version }}
         restore-keys: |
-          ${{ runner.os }}-pip-${{ matrix.python-version }}
+          ${{ matrix.os }}-pip-${{ matrix.python-version }}
 
     - name: Install System dependencies
       run: |