Skip to content

Commit 593b6fc

Browse files
authored
Merge pull request #318 from plugwise/cifix
CI: Attempt to ensure venv working after restore
2 parents 2a63597 + a48b432 commit 593b6fc

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

.github/workflows/verify.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ jobs:
2323
name: Cache identify
2424
outputs:
2525
cache-key: ${{ steps.set-key.outputs.cache-key }}
26+
python-version: ${{ steps.python.outputs.python-version }} # Ensure all runners use THIS minor version
2627
steps:
2728
- name: Check out committed code
2829
uses: actions/checkout@v5
29-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
30+
- name: Set up Python and determine minor version for ${{ env.DEFAULT_PYTHON }}
3031
id: python
3132
uses: actions/setup-python@v5
3233
with:
@@ -43,11 +44,11 @@ jobs:
4344
steps:
4445
- name: Check out committed code
4546
uses: actions/checkout@v5
46-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
47+
- name: Set up Python ${{ needs.cache.outputs.python-version }}
4748
id: python
4849
uses: actions/setup-python@v5
4950
with:
50-
python-version: ${{ env.DEFAULT_PYTHON }}
51+
python-version: ${{ needs.cache.outputs.python-version }}
5152
- name: Create or reuse cache
5253
id: cache-reuse
5354
uses: ./.github/actions/restore-venv
@@ -69,11 +70,11 @@ jobs:
6970
uses: actions/checkout@v5
7071
with:
7172
persist-credentials: false
72-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
73+
- name: Set up Python ${{ needs.cache.outputs.python-version }}
7374
id: python
7475
uses: actions/setup-python@v5
7576
with:
76-
python-version: ${{ env.DEFAULT_PYTHON }}
77+
python-version: ${{ needs.cache.outputs.python-version }}
7778
- name: Create or reuse cache
7879
id: cache-reuse
7980
uses: ./.github/actions/restore-venv
@@ -110,11 +111,11 @@ jobs:
110111
steps:
111112
- name: Check out committed code
112113
uses: actions/checkout@v5
113-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
114+
- name: Set up Python ${{ needs.cache.outputs.python-version }}
114115
id: python
115116
uses: actions/setup-python@v5
116117
with:
117-
python-version: ${{ env.DEFAULT_PYTHON }}
118+
python-version: ${{ needs.cache.outputs.python-version }}
118119
- name: Create or reuse cache
119120
id: cache-reuse
120121
uses: ./.github/actions/restore-venv
@@ -161,7 +162,7 @@ jobs:
161162
with:
162163
cache-key: ${{ needs.cache.outputs.cache-key }}-pytest-matrix-${{ matrix.python-version }}
163164
fail-on-miss: false # First time create cache (if not already exists)
164-
python-version: ${{ matrix.python-version }}
165+
python-version: ${{ steps.python.outputs.python-version }} # Force to installed python minor
165166
venv-dir: ${{ env.VENV }}
166167
precommit-home: ${{ env.PRE_COMMIT_HOME }}
167168
- name: Run all tests
@@ -189,11 +190,11 @@ jobs:
189190
uses: actions/checkout@v5
190191
with:
191192
persist-credentials: false
192-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
193+
- name: Set up Python ${{ needs.cache.outputs.python-version }}
193194
id: python
194195
uses: actions/setup-python@v5
195196
with:
196-
python-version: ${{ env.DEFAULT_PYTHON }}
197+
python-version: ${{ needs.cache.outputs.python-version }}
197198
- name: Create or reuse cache
198199
id: cache-reuse
199200
uses: ./.github/actions/restore-venv
@@ -239,11 +240,11 @@ jobs:
239240
steps:
240241
- name: Check out committed code
241242
uses: actions/checkout@v5
242-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
243+
- name: Set up Python ${{ needs.cache.outputs.python-version }}
243244
id: python
244245
uses: actions/setup-python@v5
245246
with:
246-
python-version: ${{ env.DEFAULT_PYTHON }}
247+
python-version: ${{ needs.cache.outputs.python-version }}
247248
- name: Create or reuse cache
248249
id: cache-reuse
249250
uses: ./.github/actions/restore-venv
@@ -332,11 +333,11 @@ jobs:
332333
steps:
333334
- name: Check out committed code
334335
uses: actions/checkout@v5
335-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
336+
- name: Set up Python ${{ needs.cache.outputs.python-version }}
336337
id: python
337338
uses: actions/setup-python@v5
338339
with:
339-
python-version: ${{ env.DEFAULT_PYTHON }}
340+
python-version: ${{ needs.cache.outputs.python-version }}
340341
- name: Create or reuse cache
341342
id: cache-reuse
342343
uses: ./.github/actions/restore-venv

0 commit comments

Comments
 (0)