add os to cache name

Der-Henning · Jul 29, 2023 · f2f104a · f2f104a
1 parent b59782f
commit f2f104a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,11 +36,11 @@ jobs:
     - uses: actions/setup-python@v4
       with:
         python-version: ${{ env.PYTHON_VERSION }}
-    - uses: snok/install-poetry@v1
-      with:
-        version: ${{ env.POETRY_VERSION }}
-        virtualenvs-create: true
-        virtualenvs-in-project: true
+    - name: Setup Poetry
+      run: |
+        pip install --upgrade pip setuptools wheel poetry==${{ env.POETRY_VERSION }}
+        poetry config virtualenvs.create true --local
+        poetry config virtualenvs.in-project true --local
     - name: Export requirements.txt
       run: poetry export -f requirements.txt --output requirements.txt
     - uses: docker/metadata-action@v4
@@ -104,7 +104,7 @@ jobs:
     - uses: actions/cache@v3
       with:
         path: ./.venv
-        key: venv-build-poetry-${{ env.POETRY_VERSION }}-python-${{ env.PYTHON_VERSION }}-${{ hashFiles('poetry.lock') }}
+        key: venv-build-poetry-${{ env.POETRY_VERSION }}-python-${{ env.PYTHON_VERSION }}-${{ hashFiles('poetry.lock') }}-${{ runner.os }}
     - name: Install dependencies
       run: poetry install --without test
     - name: Run PyInstaller

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -28,11 +28,11 @@ jobs:
     - uses: actions/cache@v3
       with:
         path: ./.venv
-        key: venv-test-poetry-${{ env.POETRY_VERSION }}-python-${{ matrix.python }}-${{ hashFiles('poetry.lock') }}
+        key: venv-test-poetry-${{ env.POETRY_VERSION }}-python-${{ matrix.python }}-${{ hashFiles('poetry.lock') }}-${{ runner.os }}
     - uses: actions/cache@v3
       with:
         path: ~/.cache/pre-commit
-        key: pre-commit-python-${{ matrix.python }}-${{ hashFiles('poetry.lock', '.pre-commit-config.yaml') }}
+        key: pre-commit-python-${{ matrix.python }}-${{ hashFiles('poetry.lock', '.pre-commit-config.yaml') }}-${{ runner.os }}
     - name: Install dependencies
       run: poetry install --no-interaction --without build
     - name: Run linting

diff --git a/.github/workflows/tgtg.yml b/.github/workflows/tgtg.yml
@@ -25,7 +25,7 @@ jobs:
     - uses: actions/cache@v3
       with:
         path: ./.venv
-        key: venv-test-poetry-${{ env.POETRY_VERSION }}-python-${{ env.PYTHON_VERSION }}-${{ hashFiles('poetry.lock') }}
+        key: venv-test-poetry-${{ env.POETRY_VERSION }}-python-${{ env.PYTHON_VERSION }}-${{ hashFiles('poetry.lock') }}-${{ runner.os }}
     - name: Install dependencies
       run: poetry install --without build
     - name: Run tests