Cache galaxy root/.venv instead of .tox

Unit tests are not using tox any more since commit c90e012 . Reports startup also install packages in the venv and not in `.tox` .
galaxyproject · Mar 19, 2022 · ca523f5 · ca523f5
1 parent cc5224b
commit ca523f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/reports_startup.yaml b/.github/workflows/reports_startup.yaml
@@ -12,7 +12,6 @@ concurrency:
   group: reports-startup-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-
   test:
     name: Reports startup test
     runs-on: ubuntu-latest
@@ -41,16 +40,16 @@ jobs:
       with:
         path: ~/.cache/pip
         key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('galaxy root/requirements.txt') }}
-    - name: Cache tox env
+    - name: Cache galaxy venv
       uses: actions/cache@v2
       with:
-        path: .tox
-        key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-reports-startup
+        path: 'galaxy root/.venv'
+        key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-reports-startup
     - uses: mvdbeek/gha-yarn-cache@master
       with:
         yarn-lock-file: 'galaxy root/client/yarn.lock'
     - name: Install tox
       run: pip install tox
-    - name: run tests
+    - name: Run tests
       run: tox -e reports_startup
       working-directory: 'galaxy root'
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
@@ -37,11 +37,11 @@ jobs:
         with:
           path: ~/.cache/pip
           key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('galaxy root/requirements.txt') }}
-      - name: Cache tox env
+      - name: Cache galaxy venv
         uses: actions/cache@v2
         with:
-          path: .tox
-          key: tox-cache-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-unit
+          path: 'galaxy root/.venv'
+          key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-unit
       - name: Install ffmpeg
         run: sudo apt-get update && sudo apt-get -y install ffmpeg
       - name: Run tests