From b7305284e28d5bdef15cf1c3de26248b63ad7f52 Mon Sep 17 00:00:00 2001 From: cclauss Date: Tue, 6 Oct 2020 17:51:24 +0200 Subject: [PATCH] build: gitHub actions: Python 3.9 and actions/setup-python@v2 PR-URL: https://github.com/nodejs/node/pull/35521 Reviewed-By: Richard Lau Reviewed-By: Shelley Vohr Reviewed-By: Rich Trott Reviewed-By: Jiawen Geng Reviewed-By: Myles Borins --- .github/workflows/auto-start-ci.yml | 2 +- .github/workflows/build-tarball.yml | 8 ++++---- .github/workflows/build-windows.yml | 4 ++-- .github/workflows/linters.yml | 6 +++--- .github/workflows/test-asan.yml | 4 ++-- .github/workflows/test-linux.yml | 4 ++-- .github/workflows/test-macos.yml | 4 ++-- configure | 3 ++- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/auto-start-ci.yml b/.github/workflows/auto-start-ci.yml index cb9318ab4ade9f..6ca3392720562d 100644 --- a/.github/workflows/auto-start-ci.yml +++ b/.github/workflows/auto-start-ci.yml @@ -14,7 +14,7 @@ jobs: if: github.repository == 'nodejs/node' runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 # Install dependencies - name: Install jq diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml index 0caf0bdf961914..81f121e2cf2ee0 100644 --- a/.github/workflows/build-tarball.yml +++ b/.github/workflows/build-tarball.yml @@ -14,12 +14,12 @@ env: jobs: build-tarball: env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information @@ -39,13 +39,13 @@ jobs: path: tarballs test-tarball-linux: env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 needs: build-tarball runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index ff6788e06b7858..8765d2d8d5cae5 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -10,7 +10,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Install deps diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 3cd4def9f986bc..573057742ce70b 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -9,7 +9,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 NODE_VERSION: 10.x jobs: @@ -30,7 +30,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information @@ -68,7 +68,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml index 96975024e399f5..d976b225dbc5c2 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -14,7 +14,7 @@ on: - 'doc/**' env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -28,7 +28,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index f5bedead2afa01..f96e3a28a1e791 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -10,7 +10,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index f4a2454e37f635..f12de4c5994f88 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -10,7 +10,7 @@ on: - v[0-9]+.x env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up Python ${{ env.PYTHON_VERSION }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v2 with: python-version: ${{ env.PYTHON_VERSION }} - name: Environment Information diff --git a/configure b/configure index 7e8c4cff832ffd..07581d9c5a4ff1 100755 --- a/configure +++ b/configure @@ -5,6 +5,7 @@ # as is the fact that the ] goes on a new line. _=[ 'exec' '/bin/sh' '-c' ''' test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient +command -v python3.9 >/dev/null && exec python3.9 "$0" "$@" command -v python3.8 >/dev/null && exec python3.8 "$0" "$@" command -v python3.7 >/dev/null && exec python3.7 "$0" "$@" command -v python3.6 >/dev/null && exec python3.6 "$0" "$@" @@ -19,7 +20,7 @@ import sys from distutils.spawn import find_executable print('Node.js configure: Found Python {0}.{1}.{2}...'.format(*sys.version_info)) -acceptable_pythons = ((3, 8), (3, 7), (3, 6), (3, 5), (2, 7)) +acceptable_pythons = ((3, 9), (3, 8), (3, 7), (3, 6), (3, 5), (2, 7)) if sys.version_info[:2] in acceptable_pythons: import configure else: