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)
adafruit · Dec 21, 2021 · b60a806 · b60a806
2 parents 6072016 + d61d8b1
commit b60a806
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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

diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
@@ -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

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -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