djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Dan Halbert 2021-12-20 21:24:47 -05:00 committed by GitHub
parent 6072016c7b d61d8b1020
commit b60a806968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.github/workflows/build.yml vendored
View File

@ -30,10 +30,10 @@ jobs:
with:
submodules: false
fetch-depth: 1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- name: Get CP deps
run: python tools/ci_fetch_deps.py test ${{ github.sha }}
- name: CircuitPython version
@ -136,10 +136,10 @@ jobs:
with:
submodules: false
fetch-depth: 1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- name: Get CP deps
run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
- name: CircuitPython version
@ -202,10 +202,10 @@ jobs:
run: |
git describe --dirty --tags
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- name: Install dependencies
run: |
sudo apt-get update
@ -260,10 +260,10 @@ jobs:
board: ${{ fromJSON(needs.test.outputs.boards-arm) }}
if: ${{ needs.test.outputs.boards-arm != '[]' }}
steps:
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- uses: actions/checkout@v2.2.0
with:
submodules: false
@ -312,10 +312,10 @@ jobs:
board: ${{ fromJSON(needs.test.outputs.boards-riscv) }}
if: ${{ needs.test.outputs.boards-riscv != '[]' }}
steps:
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- uses: actions/checkout@v2.2.0
with:
submodules: false
@ -364,10 +364,10 @@ jobs:
board: ${{ fromJSON(needs.test.outputs.boards-espressif) }}
if: ${{ needs.test.outputs.boards-espressif != '[]' }}
steps:
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- uses: actions/checkout@v2.2.0
with:
submodules: false
@ -451,10 +451,10 @@ jobs:
board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
if: ${{ needs.test.outputs.boards-aarch != '[]' }}
steps:
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- uses: actions/checkout@v2.2.0
with:
submodules: false

6
.github/workflows/create_website_pr.yml vendored
View File

@ -20,10 +20,10 @@ jobs:
with:
submodules: false
fetch-depth: 1
- name: Set up Python 3.8
uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: "3.x"
- name: Get CP deps
run: python tools/ci_fetch_deps.py website ${{ github.sha }}
- name: Install deps

5
.github/workflows/pre-commit.yml vendored
View File

@ -13,7 +13,10 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2.2.0
- uses: actions/setup-python@v1
- name: Set up Python 3
uses: actions/setup-python@v2
with:
python-version: "3.x"
- name: Install deps
run: |
sudo apt-add-repository -y -u ppa:pybricks/ppa