Skip to content

Commit 716144c

Browse files
cclaussTrott
authored andcommitted
build: gitHub actions: Python 3.9 and actions/setup-python@v2
PR-URL: nodejs#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 971be3e commit 716144c

File tree

5 files changed

+14
-36
lines changed

5 files changed

+14
-36
lines changed

.github/workflows/build-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: build-windows
33
on: [push, pull_request]
44

55
env:
6-
PYTHON_VERSION: 3.8
6+
PYTHON_VERSION: 3.9
77
FLAKY_TESTS: dontcare
88

99
jobs:
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Set up Python ${{ env.PYTHON_VERSION }}
15-
uses: actions/setup-python@v1
15+
uses: actions/setup-python@v2
1616
with:
1717
PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
1818
- name: Install deps

.github/workflows/linters.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: linters
33
on: [push, pull_request]
44

55
env:
6-
PYTHON_VERSION: 3.8
6+
PYTHON_VERSION: 3.9
77
NODE_VERSION: 10.x
88

99
jobs:
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v2
2626
- name: Set up Python ${{ env.PYTHON_VERSION }}
27-
uses: actions/setup-python@v1
27+
uses: actions/setup-python@v2
2828
with:
2929
PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
3030
- name: Environment Information
@@ -62,7 +62,7 @@ jobs:
6262
steps:
6363
- uses: actions/checkout@v2
6464
- name: Set up Python ${{ env.PYTHON_VERSION }}
65-
uses: actions/setup-python@v1
65+
uses: actions/setup-python@v2
6666
with:
6767
PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
6868
- name: Environment Information

.github/workflows/test-linux.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/test-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: test-macOS
33
on: [push, pull_request]
44

55
env:
6-
PYTHON_VERSION: 3.8
6+
PYTHON_VERSION: 3.9
77
FLAKY_TESTS: dontcare
88

99
jobs:
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v2
1414
- name: Set up Python ${{ env.PYTHON_VERSION }}
15-
uses: actions/setup-python@v1
15+
uses: actions/setup-python@v2
1616
with:
1717
PYTHON_VERSION: ${{ env.PYTHON_VERSION }}
1818
- name: Environment Information

configure

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
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-
which python3.8 >/dev/null && exec python3.8 "$0" "$@"
9-
which python3.7 >/dev/null && exec python3.7 "$0" "$@"
10-
which python3.6 >/dev/null && exec python3.6 "$0" "$@"
11-
which python3.5 >/dev/null && exec python3.5 "$0" "$@"
12-
which python2.7 >/dev/null && exec python2.7 "$0" "$@"
8+
command -v python3.9 >/dev/null && exec python3.9 "$0" "$@"
9+
command -v python3.8 >/dev/null && exec python3.8 "$0" "$@"
10+
command -v python3.7 >/dev/null && exec python3.7 "$0" "$@"
11+
command -v python3.6 >/dev/null && exec python3.6 "$0" "$@"
12+
command -v python3.5 >/dev/null && exec python3.5 "$0" "$@"
13+
command -v python2.7 >/dev/null && exec python2.7 "$0" "$@"
1314
exec python "$0" "$@"
1415
''' "$0" "$@"
1516
]
@@ -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)