Merge pull request #387 from jenshnielsen/cache_upgrade

Use caching step from setup-python action
QCoDeS · Nov 2, 2022 · a4bbbd6 · a4bbbd6
2 parents a9c6adb + 087531f
commit a4bbbd6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 38 deletions.
diff --git a/.github/actions/prepare-cache-pip/action.yml b/.github/actions/prepare-cache-pip/action.yml
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -56,17 +56,13 @@ jobs:
       uses: actions/setup-python@v4.3.0
       with:
         python-version: ${{ matrix.python-version }}
-    - name: prepare pip cache
-      id: prepare-cache-pip
-      uses: ./.github/actions/prepare-cache-pip
-    - name: pip cache
-      uses: actions/cache@v3.0.11
-      with:
-        path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
-        key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/pyproject.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.python-version }}-pip-
-
+        cache: 'pip'
+        cache-dependency-path: |
+          pyproject.toml
+          requirements.txt
+    - name: upgrade pip setuptools wheel
+      run: python -m pip install --upgrade pip setuptools wheel
+      shell: bash
     - name: install broadbean & docs dependencies
       run: |
         pip install -c requirements.txt .[docs,test]

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -37,16 +37,13 @@ jobs:
       uses: actions/setup-python@v4.3.0
       with:
         python-version: ${{ matrix.python-version }}
-    - name: prepare pip cache
-      id: prepare-cache-pip
-      uses: ./.github/actions/prepare-cache-pip
-    - name: pip cache
-      uses: actions/cache@v3.0.11
-      with:
-        path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
-        key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/pyproject.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-${{ matrix.python-version }}-pip-
+        cache: 'pip'
+        cache-dependency-path: |
+          pyproject.toml
+          requirements.txt
+    - name: upgrade pip setuptools wheel
+      run: python -m pip install --upgrade pip setuptools wheel
+      shell: bash
     - name: install broadbean with test dependencies
       run: |
         pip install .[test] -c requirements.txt