From e1787e776a8046eb9ad1dea8b10656962b1da1d0 Mon Sep 17 00:00:00 2001
From: Mike Almeloo <git@mikealmel.ooo>
Date: Wed, 18 Sep 2024 00:06:04 +0200
Subject: [PATCH 1/3] ci: Use exact Python version for caching

---
 .github/actions/setup-project/action.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml
index 4dfb260..d675fc7 100644
--- a/.github/actions/setup-project/action.yml
+++ b/.github/actions/setup-project/action.yml
@@ -13,6 +13,7 @@ runs:
 
   steps:
     - name: Set up Python
+      id: setup-python
       uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
@@ -35,7 +36,7 @@ runs:
       uses: actions/cache@v4
       with:
         path: .venv
-        key: venv-${{ runner.os }}-python-${{ inputs.python-version }}-groups-${{ steps.cache-key.outputs.key }}-${{ hashFiles('**/poetry.lock') }}
+        key: venv-${{ runner.os }}-python-${{ steps.setup-python.outputs.version }}-groups-${{ steps.cache-key.outputs.key }}-${{ hashFiles('**/poetry.lock') }}
 
     - name: Install dependencies
       if: steps.cache-dependencies.outputs.cache-hit != 'true'

From 137b2225c98553d071ea81c0eb48b292744a1491 Mon Sep 17 00:00:00 2001
From: Mike Almeloo <git@mikealmel.ooo>
Date: Wed, 18 Sep 2024 00:13:50 +0200
Subject: [PATCH 2/3] ci: Do not use setup-python to determine version

---
 .github/actions/setup-project/action.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml
index d675fc7..c0dbec0 100644
--- a/.github/actions/setup-project/action.yml
+++ b/.github/actions/setup-project/action.yml
@@ -13,7 +13,6 @@ runs:
 
   steps:
     - name: Set up Python
-      id: setup-python
       uses: actions/setup-python@v5
       with:
         python-version: ${{ inputs.python-version }}
@@ -31,12 +30,16 @@ runs:
         key=$(echo "${{ inputs.dependency-groups }}" | sed 's/,/+/')
         echo "key=$key" >> "$GITHUB_OUTPUT"
 
+    - name: Get full Python version
+      id: full-python-version
+      run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
+
     - name: Load cached venv
       id: cache-dependencies
       uses: actions/cache@v4
       with:
         path: .venv
-        key: venv-${{ runner.os }}-python-${{ steps.setup-python.outputs.version }}-groups-${{ steps.cache-key.outputs.key }}-${{ hashFiles('**/poetry.lock') }}
+        key: venv-${{ runner.os }}-py${{ steps.full-python-version.outputs.version }}-grp${{ steps.cache-key.outputs.key }}-${{ hashFiles('**/poetry.lock') }}
 
     - name: Install dependencies
       if: steps.cache-dependencies.outputs.cache-hit != 'true'

From f1cb07effc886109a62a6678c4c8865e4ee29ace Mon Sep 17 00:00:00 2001
From: Mike Almeloo <git@mikealmel.ooo>
Date: Wed, 18 Sep 2024 00:14:47 +0200
Subject: [PATCH 3/3] ci: Add missing `shell` property

---
 .github/actions/setup-project/action.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/actions/setup-project/action.yml b/.github/actions/setup-project/action.yml
index c0dbec0..94d0ed8 100644
--- a/.github/actions/setup-project/action.yml
+++ b/.github/actions/setup-project/action.yml
@@ -32,6 +32,7 @@ runs:
 
     - name: Get full Python version
       id: full-python-version
+      shell: bash
       run: echo version=$(python -c "import sys; print('-'.join(str(v) for v in sys.version_info))") >> $GITHUB_OUTPUT
 
     - name: Load cached venv