From d500eea0b12b26e8e0e41b3750286c8caa116eb5 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Fri, 15 Aug 2025 10:52:15 +0200 Subject: [PATCH 1/2] Force python minor version --- .github/workflows/verify.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 2de2e4b2b..7c7055458 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -23,10 +23,11 @@ jobs: name: Cache identify outputs: cache-key: ${{ steps.set-key.outputs.cache-key }} + python-version: ${{ steps.python.outputs.python-verseion}} # Ensure all runners use THIS minor version steps: - name: Check out committed code uses: actions/checkout@v5 - - name: Set up Python ${{ env.DEFAULT_PYTHON }} + - name: Set up Python and determine minor version for ${{ env.DEFAULT_PYTHON }} id: python uses: actions/setup-python@v5 with: @@ -52,7 +53,7 @@ jobs: fail-on-miss: false # First time create cache (if not already exists) python-version: ${{ env.DEFAULT_PYTHON }} venv-dir: ${{ env.VENV }} - precommit-home: ${{ env.PRE_COMMIT_HOME }} + precommit-home: ${{ needs.cache.outputs.python-version }} ruff: runs-on: ubuntu-latest @@ -70,7 +71,7 @@ jobs: uses: plugwise/gh-actions/restore-venv@v1 with: cache-key: ${{ needs.cache.outputs.cache-key }} - python-version: ${{ env.DEFAULT_PYTHON }} + python-version: ${{ needs.cache.outputs.python-version}} venv-dir: ${{ env.VENV }} precommit-home: ${{ env.PRE_COMMIT_HOME }} - name: Ruff (with fix) @@ -106,7 +107,7 @@ jobs: uses: plugwise/gh-actions/restore-venv@v1 with: cache-key: ${{ needs.cache.outputs.cache-key }} - python-version: ${{ env.DEFAULT_PYTHON }} + python-version: ${{ needs.cache.outputs.python-version}} venv-dir: ${{ env.VENV }} precommit-home: ${{ env.PRE_COMMIT_HOME }} - name: Verify commit @@ -136,12 +137,17 @@ jobs: steps: - name: Check out committed code uses: actions/checkout@v5 + - name: Set up Python ${{ matrix.python-version }} + id: python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} - name: Restore cached environment id: cache-reuse uses: plugwise/gh-actions/restore-venv@v1 with: cache-key: ${{ needs.cache.outputs.cache-key }} - python-version: ${{ env.DEFAULT_PYTHON }} + python-version: ${{ steps.python.outputs.python-version }} # Force to installed python minor$ venv-dir: ${{ env.VENV }} precommit-home: ${{ env.PRE_COMMIT_HOME }} - name: Run all tests @@ -173,7 +179,7 @@ jobs: uses: plugwise/gh-actions/restore-venv@v1 with: cache-key: ${{ needs.cache.outputs.cache-key }} - python-version: ${{ env.DEFAULT_PYTHON }} + python-version: ${{ needs.cache.outputs.python-version}} venv-dir: ${{ env.VENV }} precommit-home: ${{ env.PRE_COMMIT_HOME }} - name: Run mypy @@ -218,7 +224,7 @@ jobs: uses: plugwise/gh-actions/restore-venv@v1 with: cache-key: ${{ needs.cache.outputs.cache-key }} - python-version: ${{ env.DEFAULT_PYTHON }} + python-version: ${{ needs.cache.outputs.python-version}} venv-dir: ${{ env.VENV }} precommit-home: ${{ env.PRE_COMMIT_HOME }} - name: Download all coverage artifacts @@ -296,7 +302,7 @@ jobs: uses: plugwise/gh-actions/restore-venv@v1 with: cache-key: ${{ needs.cache.outputs.cache-key }} - python-version: ${{ env.DEFAULT_PYTHON }} + python-version: ${{ needs.cache.outputs.python-version}} venv-dir: ${{ env.VENV }} precommit-home: ${{ env.PRE_COMMIT_HOME }} - name: Run complexity report (click to view details) From 7555de94149f4c0bca7d1ea7610dffbd04032720 Mon Sep 17 00:00:00 2001 From: Tom Scholten Date: Fri, 15 Aug 2025 11:14:06 +0200 Subject: [PATCH 2/2] Typos --- .github/workflows/verify.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 7c7055458..3067c53c6 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -23,7 +23,7 @@ jobs: name: Cache identify outputs: cache-key: ${{ steps.set-key.outputs.cache-key }} - python-version: ${{ steps.python.outputs.python-verseion}} # Ensure all runners use THIS minor version + python-version: ${{ steps.python.outputs.python-version}} # Ensure all runners use THIS minor version steps: - name: Check out committed code uses: actions/checkout@v5 @@ -51,9 +51,9 @@ jobs: with: cache-key: ${{ needs.cache.outputs.cache-key }} fail-on-miss: false # First time create cache (if not already exists) - python-version: ${{ env.DEFAULT_PYTHON }} + python-version: ${{ needs.cache.outputs.python-version }} venv-dir: ${{ env.VENV }} - precommit-home: ${{ needs.cache.outputs.python-version }} + precommit-home: ${{ env.PRE_COMMIT_HOME }} ruff: runs-on: ubuntu-latest