From: Ben Darnell Date: Sun, 9 Apr 2023 21:31:38 +0000 (+0000) Subject: ci: Update build workflow X-Git-Tag: v6.3.0~1^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3250%2Fhead;p=thirdparty%2Ftornado.git ci: Update build workflow Build wheels for Python 3.12 as well. Update various dependencies. The upload/download artifact actions were using deprecated versions, and we were using a deprecated macos build image. While we're at it, update the other OS versions and cibuildwheel. --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8734328f4..8b921d84b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ env: jobs: build_sdist: name: Build sdist - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -33,7 +33,7 @@ jobs: - name: Build sdist run: "python setup.py sdist && ls -l dist" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: path: ./dist/tornado-*.tar.gz @@ -43,7 +43,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019, macos-10.15] + os: [ubuntu-22.04, windows-2022, macos-12] steps: - uses: actions/checkout@v3 @@ -58,19 +58,19 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.6.1 + uses: pypa/cibuildwheel@v2.12.1 - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: path: ./wheelhouse/*.whl upload_pypi_test: name: Upload to PyPI (test) needs: [build_wheels, build_sdist] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.event_name == 'push' && startsWith(github.ref_name, 'build-workflow') steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: artifact path: dist @@ -85,10 +85,10 @@ jobs: upload_pypi: name: Upload to PyPI (prod) needs: [build_wheels, build_sdist] - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: github.event_name == 'push' && github.ref_type == 'tag' && startsWith(github.ref_name, 'v') steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v3 with: name: artifact path: dist diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d9a6082dd..ff38e6652 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: # first-time contributors). test_quick: name: Run quick tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -32,7 +32,7 @@ jobs: test_tox: name: Run full tests needs: test_quick - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: diff --git a/pyproject.toml b/pyproject.toml index 1a395be17..fa75e066f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"] build-backend = "setuptools.build_meta" [tool.cibuildwheel] -build = "cp3[89]* cp310* cp311*" +build = "cp3[89]* cp310* cp311* cp312*" test-command = "python -m tornado.test" [tool.cibuildwheel.macos]