Skip to content

Commit 38eb79c

Browse files
committed
fix CI python versioning
1 parent f65382c commit 38eb79c

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,14 @@ jobs:
4545
- uses: actions/checkout@v4
4646
- name: Set up Python ${{ matrix.python-version }}
4747
uses: actions/setup-python@v5
48+
id: sp
4849
with:
4950
python-version: ${{ matrix.python-version }}
5051
- name: Install Just
5152
uses: extractions/setup-just@v2
5253
- name: Install Dependencies
5354
run: |
54-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
55+
just init ${{ steps.sp.outputs.python-path }}
5556
just install django~=${{ matrix.django-version }}
5657
- name: Install Emacs
5758
if: ${{ github.event.inputs.debug == 'true' }}

.github/workflows/test.yml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
- uses: actions/checkout@v4
5353
- name: Set up Python ${{ matrix.python-version }}
5454
uses: actions/setup-python@v5
55+
id: sp
5556
with:
5657
python-version: ${{ matrix.python-version }}
5758
- name: install-emacs-linux
@@ -68,7 +69,7 @@ jobs:
6869
uses: extractions/setup-just@v2
6970
- name: Install
7071
run: |
71-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
72+
just init ${{ steps.sp.outputs.python-path }}
7273
just install
7374
just pin-dependency Django~=${{ matrix.django-version }}
7475
sudo apt remove powershell
@@ -107,6 +108,7 @@ jobs:
107108
- uses: actions/checkout@v4
108109
- name: Set up Python ${{ matrix.python-version }}
109110
uses: actions/setup-python@v5
111+
id: sp
110112
with:
111113
python-version: ${{ matrix.python-version }}
112114
- name: setup-ssh-debug
@@ -121,7 +123,7 @@ jobs:
121123
uses: extractions/setup-just@v2
122124
- name: Install
123125
run: |
124-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
126+
just init ${{ steps.sp.outputs.python-path }}
125127
just install
126128
just pin-dependency Django~=${{ matrix.django-version }}
127129
- name: Run Unit Tests
@@ -158,6 +160,7 @@ jobs:
158160
- uses: actions/checkout@v4
159161
- name: Set up Python ${{ matrix.python-version }}
160162
uses: actions/setup-python@v5
163+
id: sp
161164
with:
162165
python-version: ${{ matrix.python-version }}
163166
- name: install-emacs-macos
@@ -174,7 +177,7 @@ jobs:
174177
brew install just
175178
- name: Install
176179
run: |
177-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
180+
just init ${{ steps.sp.outputs.python-path }}
178181
just install
179182
just pin-dependency Django~=${{ matrix.django-version }}
180183
- name: Run Unit Tests
@@ -229,6 +232,7 @@ jobs:
229232
- uses: actions/checkout@v4
230233
- name: Set up Python ${{ matrix.python-version }}
231234
uses: actions/setup-python@v5
235+
id: sp
232236
with:
233237
python-version: ${{ matrix.python-version }}
234238
- name: install-emacs-macos
@@ -244,7 +248,7 @@ jobs:
244248
uses: extractions/setup-just@v2
245249
- name: Install
246250
run: |
247-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
251+
just init ${{ steps.sp.outputs.python-path }}
248252
just install --with psycopg3
249253
just pin-dependency Django~=${{ matrix.django-version }}
250254
- name: Run Unit Tests
@@ -279,6 +283,7 @@ jobs:
279283
- uses: actions/checkout@v4
280284
- name: Set up Python ${{ matrix.python-version }}
281285
uses: actions/setup-python@v5
286+
id: sp
282287
with:
283288
python-version: ${{ matrix.python-version }}
284289
- name: install-emacs-linux
@@ -294,7 +299,7 @@ jobs:
294299
uses: extractions/setup-just@v2
295300
- name: Install
296301
run: |
297-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
302+
just init ${{ steps.sp.outputs.python-path }}
298303
just install
299304
just pin-dependency Django~=${{ matrix.django-version }}
300305
- name: Test Tab Completion
@@ -330,6 +335,7 @@ jobs:
330335
- uses: actions/checkout@v4
331336
- name: Set up Python ${{ matrix.python-version }}
332337
uses: actions/setup-python@v5
338+
id: sp
333339
with:
334340
python-version: ${{ matrix.python-version }}
335341
- name: install-emacs-linux
@@ -345,7 +351,7 @@ jobs:
345351
uses: extractions/setup-just@v2
346352
- name: Install
347353
run: |
348-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
354+
just init ${{ steps.sp.outputs.python-path }}
349355
just install
350356
just pin-dependency Django~=${{ matrix.django-version }}
351357
- name: Install Fish shell
@@ -387,6 +393,7 @@ jobs:
387393
- uses: actions/checkout@v4
388394
- name: Set up Python ${{ matrix.python-version }}
389395
uses: actions/setup-python@v5
396+
id: sp
390397
with:
391398
python-version: ${{ matrix.python-version }}
392399
- name: install-emacs-macos
@@ -412,7 +419,7 @@ jobs:
412419
run: echo "SHELL=$(which zsh)" >> $GITHUB_ENV
413420
- name: Install
414421
run: |
415-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
422+
just init ${{ steps.sp.outputs.python-path }}
416423
just install
417424
just pin-dependency Django~=${{ matrix.django-version }}
418425
- name: Run Unit Tests
@@ -450,6 +457,7 @@ jobs:
450457
- uses: actions/checkout@v4
451458
- name: Set up Python ${{ matrix.python-version }}
452459
uses: actions/setup-python@v5
460+
id: sp
453461
with:
454462
python-version: ${{ matrix.python-version }}
455463
- name: install-emacs-macos
@@ -466,7 +474,7 @@ jobs:
466474
brew install just
467475
- name: Install
468476
run: |
469-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
477+
just init ${{ steps.sp.outputs.python-path }}
470478
just install
471479
just pin-dependency Django~=${{ matrix.django-version }}
472480
- name: Run Unit Tests
@@ -503,6 +511,7 @@ jobs:
503511
- uses: actions/checkout@v4
504512
- name: Set up Python ${{ matrix.python-version }}
505513
uses: actions/setup-python@v5
514+
id: sp
506515
with:
507516
python-version: ${{ matrix.python-version }}
508517
- name: install-emacs-macos
@@ -526,7 +535,7 @@ jobs:
526535
run: echo "SHELL=$(which fish)" >> $GITHUB_ENV
527536
- name: Install
528537
run: |
529-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
538+
just init ${{ steps.sp.outputs.python-path }}
530539
just install
531540
just pin-dependency Django~=${{ matrix.django-version }}
532541
- name: Run Tab Completion Tests
@@ -564,6 +573,7 @@ jobs:
564573
- uses: actions/checkout@v4
565574
- name: Set up Python ${{ matrix.python-version }}
566575
uses: actions/setup-python@v5
576+
id: sp
567577
with:
568578
python-version: ${{ matrix.python-version }}
569579
- name: install-vim-windows
@@ -581,7 +591,7 @@ jobs:
581591
uses: extractions/setup-just@v2
582592
- name: Install Release Dependencies
583593
run: |
584-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
594+
just init ${{ steps.sp.outputs.python-path }}
585595
just install
586596
just pin-dependency Django~=${{ matrix.django-version }}
587597
shell: powershell
@@ -629,11 +639,12 @@ jobs:
629639
detached: true
630640
- uses: actions/checkout@v4
631641
- uses: actions/setup-python@v5
642+
id: sp
632643
- name: Setup Just
633644
uses: extractions/setup-just@v2
634645
- name: Install Release Dependencies
635646
run: |
636-
just init ${{ steps.setup_python.outputs.python-location }}/bin/python
647+
just init ${{ steps.sp.outputs.python-path }}
637648
just install
638649
639650
- name: Get coverage files

0 commit comments

Comments
 (0)