Merge pull request #177 from jenshnielsen/build_in_cache

Use cache from python github actions
QCoDeS · Nov 16, 2022 · 6a3df1c · 6a3df1c
2 parents b5d0248 + 8961690
commit 6a3df1c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 37 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
@@ -50,16 +50,13 @@ jobs:
       uses: actions/[email protected]
       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/[email protected]
-      with:
-        path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
-        key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}
-        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 qcodes
       run: pip install .[docs] -c requirements.txt
     - name: Build docs on linux

diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -40,16 +40,13 @@ jobs:
       uses: actions/[email protected]
       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/[email protected]
-      with:
-        path: ${{ steps.prepare-cache-pip.outputs.cache-dir }}
-        key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/setup.cfg') }}
-        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 package
       run: |
         pip install .[test] -c requirements.txt