use the same caching and a pip install for all CI (#611)

lightly-ai · Dec 1, 2021 · 96cd69b · 96cd69b
1 parent 3e753e8
commit 96cd69b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python }}
-    - name: Install Dependencies
+    - uses: actions/cache@v2
+      with:
+        path: ${{ env.pythonLocation }}
+        key: cache_v1_${{ env.pythonLocation }}-${{ hashFiles('requirements/**') }}
+    - name: Install Dependencies and lightly
       run: pip install -e '.[all]'
     - name: Run Pytest
       run: |

diff --git a/.github/workflows/test_setup.yml b/.github/workflows/test_setup.yml
@@ -19,14 +19,12 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.7
-    - name: Install Dependencies
-      run: pip install -e '.[all]'
-    - name: Install lightly directly from a branch
-      run: |
-        sudo apt install git
-        pip uninstall lightly --yes
-        BRANCH_NAME=${GITHUB_REF##*/}
-        pip install "git+https://github.com/lightly-ai/lightly.git@$BRANCH_NAME"
+    - uses: actions/cache@v2
+      with:
+        path: ${{ env.pythonLocation }}
+        key: cache_v1_${{ env.pythonLocation }}-${{ hashFiles('requirements/**') }}
+    - name: Install Dependencies and lightly
+      run: pip install .
     - name: basic tests of CLI
       run: |
         LIGHTLY_SERVER_LOCATION="localhost:-1"

diff --git a/.github/workflows/tests_unmocked.yml b/.github/workflows/tests_unmocked.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/cache@v2
       with:
         path: ${{ env.pythonLocation }}
-        key: cache_v1_${{ env.pythonLocation }}-${{ hashFiles('requirements.txt') }}
+        key: cache_v1_${{ env.pythonLocation }}-${{ hashFiles('requirements/**') }}
     - name: Install Dependencies and lightly
       run: pip install .
     - name: run unmocked tests