From eec6857b5eb97d41dae652a7f74aab7bb510ed1f 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/build-tarball.yml | 10 +++++----- .github/workflows/build-windows.yml | 4 ++-- .github/workflows/linters.yml | 6 +++--- .github/workflows/test-asan.yml | 4 ++-- .github/workflows/test-linux.yml | 21 ++++++++++++++++++--- .github/workflows/test-macos.yml | 4 ++-- configure | 13 +++++++------ 7 files changed, 39 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml index b706e7ef855de6..73901db646bd7d 100644 --- a/.github/workflows/build-tarball.yml +++ b/.github/workflows/build-tarball.yml @@ -8,12 +8,12 @@ env: jobs: build-tarball: env: - PYTHON_VERSION: 3.8 - runs-on: macos-latest + 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 @@ -33,13 +33,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 8a9dbf90415688..fa7b14d143afee 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -3,7 +3,7 @@ name: build-windows on: [push, pull_request] env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -12,7 +12,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 9b4ebca75c86ca..d23076cd461487 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -3,7 +3,7 @@ name: linters on: [push, pull_request] env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 NODE_VERSION: 10.x jobs: @@ -24,7 +24,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 @@ -62,7 +62,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 54d6cae049badb..f1713dd3a487df 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -9,7 +9,7 @@ on: - 'doc/**' env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -23,7 +23,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 cfe0ca4ab70334..c3b112ea10fcee 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -3,7 +3,7 @@ name: test-linux on: [push, pull_request] env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -12,7 +12,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 @@ -20,4 +20,19 @@ jobs: - name: Build run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn" - name: Test - run: make run-ci -j2 V=1 TEST_CI_ARGS="-p dots" + run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions" + + test-linux-with-quic: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ env.PYTHON_VERSION }} + uses: actions/setup-python@v2 + with: + python-version: ${{ env.PYTHON_VERSION }} + - name: Environment Information + run: npx envinfo + - name: Build + run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic" + - name: Test + run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions" diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index c78ab45e4b2398..fff47af3e58789 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -3,7 +3,7 @@ name: test-macOS on: [push, pull_request] env: - PYTHON_VERSION: 3.8 + PYTHON_VERSION: 3.9 FLAKY_TESTS: dontcare jobs: @@ -12,7 +12,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 71c2fc87ca4cfc..07581d9c5a4ff1 100755 --- a/configure +++ b/configure @@ -5,11 +5,12 @@ # as is the fact that the ] goes on a new line. _=[ 'exec' '/bin/sh' '-c' ''' test ${FORCE_PYTHON2} && exec python2 "$0" "$@" # workaround for gclient -which python3.8 >/dev/null && exec python3.8 "$0" "$@" -which python3.7 >/dev/null && exec python3.7 "$0" "$@" -which python3.6 >/dev/null && exec python3.6 "$0" "$@" -which python3.5 >/dev/null && exec python3.5 "$0" "$@" -which python2.7 >/dev/null && exec python2.7 "$0" "$@" +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" "$@" +command -v python3.5 >/dev/null && exec python3.5 "$0" "$@" +command -v python2.7 >/dev/null && exec python2.7 "$0" "$@" exec python "$0" "$@" ''' "$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: