Skip to content

Commit 1c68cc1

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 0038ecd commit 1c68cc1

7 files changed

+34
-18
lines changed

.github/workflows/build-tarball.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ env:
88
jobs:
99
build-tarball:
1010
env:
11-
PYTHON_VERSION: 3.8
12-
runs-on: macos-latest
11+
PYTHON_VERSION: 3.9
12+
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v2
1515
- name: Set up Python ${{ env.PYTHON_VERSION }}
16-
uses: actions/setup-python@v1
16+
uses: actions/setup-python@v2
1717
with:
1818
python-version: ${{ env.PYTHON_VERSION }}
1919
- name: Environment Information
@@ -33,13 +33,13 @@ jobs:
3333
path: tarballs
3434
test-tarball-linux:
3535
env:
36-
PYTHON_VERSION: 3.8
36+
PYTHON_VERSION: 3.9
3737
needs: build-tarball
3838
runs-on: ubuntu-latest
3939
steps:
4040
- uses: actions/checkout@v2
4141
- name: Set up Python ${{ env.PYTHON_VERSION }}
42-
uses: actions/setup-python@v1
42+
uses: actions/setup-python@v2
4343
with:
4444
python-version: ${{ env.PYTHON_VERSION }}
4545
- name: Environment Information

.github/workflows/build-windows.yml

+2-2
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

+3-3
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-asan.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- 'doc/**'
1010

1111
env:
12-
PYTHON_VERSION: 3.8
12+
PYTHON_VERSION: 3.9
1313
FLAKY_TESTS: dontcare
1414

1515
jobs:
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v2
2525
- name: Set up Python ${{ env.PYTHON_VERSION }}
26-
uses: actions/setup-python@v1
26+
uses: actions/setup-python@v2
2727
with:
2828
python-version: ${{ env.PYTHON_VERSION }}
2929
- name: Environment Information

.github/workflows/test-linux.yml

+18-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: test-linux
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,12 +12,27 @@ 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
1919
run: npx envinfo
2020
- name: Build
2121
run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn"
2222
- name: Test
23-
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p dots"
23+
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"
24+
25+
test-linux-with-quic:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- uses: actions/checkout@v2
29+
- name: Set up Python ${{ env.PYTHON_VERSION }}
30+
uses: actions/setup-python@v2
31+
with:
32+
python-version: ${{ env.PYTHON_VERSION }}
33+
- name: Environment Information
34+
run: npx envinfo
35+
- name: Build
36+
run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic"
37+
- name: Test
38+
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"

.github/workflows/test-macos.yml

+2-2
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

+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)