Skip to content

Commit b60a806

Browse files
authored
Merge pull request #5752 from jepler/ci-python3
make github-ci install python version "3.x" everywhere we use actions/setup-python (and upgrade to setup-python@v2)
2 parents 6072016 + d61d8b1 commit b60a806

File tree

3 files changed

+28
-25
lines changed

3 files changed

+28
-25
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
with:
3131
submodules: false
3232
fetch-depth: 1
33-
- name: Set up Python 3.8
34-
uses: actions/setup-python@v1
33+
- name: Set up Python 3
34+
uses: actions/setup-python@v2
3535
with:
36-
python-version: 3.8
36+
python-version: "3.x"
3737
- name: Get CP deps
3838
run: python tools/ci_fetch_deps.py test ${{ github.sha }}
3939
- name: CircuitPython version
@@ -136,10 +136,10 @@ jobs:
136136
with:
137137
submodules: false
138138
fetch-depth: 1
139-
- name: Set up Python 3.8
140-
uses: actions/setup-python@v1
139+
- name: Set up Python 3
140+
uses: actions/setup-python@v2
141141
with:
142-
python-version: 3.8
142+
python-version: "3.x"
143143
- name: Get CP deps
144144
run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
145145
- name: CircuitPython version
@@ -202,10 +202,10 @@ jobs:
202202
run: |
203203
git describe --dirty --tags
204204
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
205-
- name: Set up Python 3.8
206-
uses: actions/setup-python@v1
205+
- name: Set up Python 3
206+
uses: actions/setup-python@v2
207207
with:
208-
python-version: 3.8
208+
python-version: "3.x"
209209
- name: Install dependencies
210210
run: |
211211
sudo apt-get update
@@ -260,10 +260,10 @@ jobs:
260260
board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
261261
if: ${{ needs.test.outputs.boards-arm != '[]' }}
262262
steps:
263-
- name: Set up Python 3.8
264-
uses: actions/setup-python@v1
263+
- name: Set up Python 3
264+
uses: actions/setup-python@v2
265265
with:
266-
python-version: 3.8
266+
python-version: "3.x"
267267
- uses: actions/[email protected]
268268
with:
269269
submodules: false
@@ -312,10 +312,10 @@ jobs:
312312
board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
313313
if: ${{ needs.test.outputs.boards-riscv != '[]' }}
314314
steps:
315-
- name: Set up Python 3.8
316-
uses: actions/setup-python@v1
315+
- name: Set up Python 3
316+
uses: actions/setup-python@v2
317317
with:
318-
python-version: 3.8
318+
python-version: "3.x"
319319
- uses: actions/[email protected]
320320
with:
321321
submodules: false
@@ -364,10 +364,10 @@ jobs:
364364
board: ${{ fromJSON(needs.test.outputs.boards-espressif) }}
365365
if: ${{ needs.test.outputs.boards-espressif != '[]' }}
366366
steps:
367-
- name: Set up Python 3.8
368-
uses: actions/setup-python@v1
367+
- name: Set up Python 3
368+
uses: actions/setup-python@v2
369369
with:
370-
python-version: 3.8
370+
python-version: "3.x"
371371
- uses: actions/[email protected]
372372
with:
373373
submodules: false
@@ -451,10 +451,10 @@ jobs:
451451
board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
452452
if: ${{ needs.test.outputs.boards-aarch != '[]' }}
453453
steps:
454-
- name: Set up Python 3.8
455-
uses: actions/setup-python@v1
454+
- name: Set up Python 3
455+
uses: actions/setup-python@v2
456456
with:
457-
python-version: 3.8
457+
python-version: "3.x"
458458
- uses: actions/[email protected]
459459
with:
460460
submodules: false

.github/workflows/create_website_pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
submodules: false
2222
fetch-depth: 1
23-
- name: Set up Python 3.8
24-
uses: actions/setup-python@v1
23+
- name: Set up Python 3
24+
uses: actions/setup-python@v2
2525
with:
26-
python-version: 3.8
26+
python-version: "3.x"
2727
- name: Get CP deps
2828
run: python tools/ci_fetch_deps.py website ${{ github.sha }}
2929
- name: Install deps

.github/workflows/pre-commit.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- uses: actions/[email protected]
16-
- uses: actions/setup-python@v1
16+
- name: Set up Python 3
17+
uses: actions/setup-python@v2
18+
with:
19+
python-version: "3.x"
1720
- name: Install deps
1821
run: |
1922
sudo apt-add-repository -y -u ppa:pybricks/ppa

0 commit comments

Comments
 (0)