From 82dbe43326554606ba92db8854dbc38f6a2fac98 Mon Sep 17 00:00:00 2001
From: Nathan Dines <nathandines@users.noreply.github.com>
Date: Sat, 27 Jan 2024 19:21:42 +1100
Subject: [PATCH] Revert "Streamline cache"

---
 .github/workflows/pr-tests.yml     |  4 ----
 .github/workflows/run_in_pyenv.yml | 11 ++---------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
index e7efe32..a19acc2 100644
--- a/.github/workflows/pr-tests.yml
+++ b/.github/workflows/pr-tests.yml
@@ -10,22 +10,18 @@ jobs:
     uses: nathandines/calibre-template-functions/.github/workflows/run_in_pyenv.yml@main
     with:
       run_command: poetry run mypy .
-      cached: true
   linter-ruff:
     needs: [python-deps]
     uses: nathandines/calibre-template-functions/.github/workflows/run_in_pyenv.yml@main
     with:
       run_command: poetry run ruff check --output-format=github .
-      cached: true
   formatter-ruff:
     needs: [python-deps]
     uses: nathandines/calibre-template-functions/.github/workflows/run_in_pyenv.yml@main
     with:
       run_command: poetry run ruff format --check .
-      cached: true
   tests-pytest:
     needs: [python-deps]
     uses: nathandines/calibre-template-functions/.github/workflows/run_in_pyenv.yml@main
     with:
       run_command: poetry run pytest -v --cov=. .
-      cached: true
diff --git a/.github/workflows/run_in_pyenv.yml b/.github/workflows/run_in_pyenv.yml
index e617e76..7625e9a 100644
--- a/.github/workflows/run_in_pyenv.yml
+++ b/.github/workflows/run_in_pyenv.yml
@@ -6,24 +6,17 @@ on:
         required: false
         description: Command to run in pyenv
         type: string
-      cached:
-        required: false
-        default: false
-        description: Whether to rely on cached dependencies (i.e. don't run Poetry)
-        type: boolean
 
 jobs:
   pyenv-workflow:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - if: ${{ ! inputs.cached }}
-        run: pipx install poetry
+      - run: pipx install poetry
       - uses: actions/setup-python@v5
         with:
           python-version-file: .python-version
           cache: poetry
-      - if: ${{ ! inputs.cached }}
-        run: poetry install
+      - run: poetry install
       - if: ${{ inputs.run_command != '' }}
         run: ${{ inputs.run_command }}