Skip to content

Commit b730528

Browse files
cclaussMylesBorins
authored andcommitted
build: gitHub actions: Python 3.9 and actions/setup-python@v2
PR-URL: #35521 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Shelley Vohr <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Myles Borins <[email protected]>
1 parent bd34410 commit b730528

8 files changed

+18
-17
lines changed

.github/workflows/auto-start-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.repository == 'nodejs/node'
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@master
17+
- uses: actions/checkout@v2
1818

1919
# Install dependencies
2020
- name: Install jq

.github/workflows/build-tarball.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ env:
1414
jobs:
1515
build-tarball:
1616
env:
17-
PYTHON_VERSION: 3.8
17+
PYTHON_VERSION: 3.9
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Set up Python ${{ env.PYTHON_VERSION }}
22-
uses: actions/setup-python@v1
22+
uses: actions/setup-python@v2
2323
with:
2424
python-version: ${{ env.PYTHON_VERSION }}
2525
- name: Environment Information
@@ -39,13 +39,13 @@ jobs:
3939
path: tarballs
4040
test-tarball-linux:
4141
env:
42-
PYTHON_VERSION: 3.8
42+
PYTHON_VERSION: 3.9
4343
needs: build-tarball
4444
runs-on: ubuntu-latest
4545
steps:
4646
- uses: actions/checkout@v2
4747
- name: Set up Python ${{ env.PYTHON_VERSION }}
48-
uses: actions/setup-python@v1
48+
uses: actions/setup-python@v2
4949
with:
5050
python-version: ${{ env.PYTHON_VERSION }}
5151
- name: Environment Information

.github/workflows/build-windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- v[0-9]+.x
1111

1212
env:
13-
PYTHON_VERSION: 3.8
13+
PYTHON_VERSION: 3.9
1414
FLAKY_TESTS: dontcare
1515

1616
jobs:
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Set up Python ${{ env.PYTHON_VERSION }}
22-
uses: actions/setup-python@v1
22+
uses: actions/setup-python@v2
2323
with:
2424
python-version: ${{ env.PYTHON_VERSION }}
2525
- name: Install deps

.github/workflows/linters.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- v[0-9]+.x
1010

1111
env:
12-
PYTHON_VERSION: 3.8
12+
PYTHON_VERSION: 3.9
1313
NODE_VERSION: 10.x
1414

1515
jobs:
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131
- uses: actions/checkout@v2
3232
- name: Set up Python ${{ env.PYTHON_VERSION }}
33-
uses: actions/setup-python@v1
33+
uses: actions/setup-python@v2
3434
with:
3535
python-version: ${{ env.PYTHON_VERSION }}
3636
- name: Environment Information
@@ -68,7 +68,7 @@ jobs:
6868
steps:
6969
- uses: actions/checkout@v2
7070
- name: Set up Python ${{ env.PYTHON_VERSION }}
71-
uses: actions/setup-python@v1
71+
uses: actions/setup-python@v2
7272
with:
7373
python-version: ${{ env.PYTHON_VERSION }}
7474
- name: Environment Information

.github/workflows/test-asan.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- 'doc/**'
1515

1616
env:
17-
PYTHON_VERSION: 3.8
17+
PYTHON_VERSION: 3.9
1818
FLAKY_TESTS: dontcare
1919

2020
jobs:
@@ -28,7 +28,7 @@ jobs:
2828
steps:
2929
- uses: actions/checkout@v2
3030
- name: Set up Python ${{ env.PYTHON_VERSION }}
31-
uses: actions/setup-python@v1
31+
uses: actions/setup-python@v2
3232
with:
3333
python-version: ${{ env.PYTHON_VERSION }}
3434
- name: Environment Information

.github/workflows/test-linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- v[0-9]+.x
1111

1212
env:
13-
PYTHON_VERSION: 3.8
13+
PYTHON_VERSION: 3.9
1414
FLAKY_TESTS: dontcare
1515

1616
jobs:
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Set up Python ${{ env.PYTHON_VERSION }}
22-
uses: actions/setup-python@v1
22+
uses: actions/setup-python@v2
2323
with:
2424
python-version: ${{ env.PYTHON_VERSION }}
2525
- name: Environment Information

.github/workflows/test-macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- v[0-9]+.x
1111

1212
env:
13-
PYTHON_VERSION: 3.8
13+
PYTHON_VERSION: 3.9
1414
FLAKY_TESTS: dontcare
1515

1616
jobs:
@@ -19,7 +19,7 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v2
2121
- name: Set up Python ${{ env.PYTHON_VERSION }}
22-
uses: actions/setup-python@v1
22+
uses: actions/setup-python@v2
2323
with:
2424
python-version: ${{ env.PYTHON_VERSION }}
2525
- name: Environment Information

configure

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# as is the fact that the ] goes on a new line.
66
_=[ 'exec' '/bin/sh' '-c' '''
77
test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient
8+
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
89
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
910
command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
1011
command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
@@ -19,7 +20,7 @@ import sys
1920
from distutils.spawn import find_executable
2021

2122
print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info))
22-
acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
23+
acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7))
2324
if sys.version_info[:2] in acceptable_pythons:
2425
import configure
2526
else:

0 commit comments

Comments
 (0)