From: Ben Darnell <ben@bendarnell.com>
Date: Thu, 22 May 2025 20:27:48 +0000 (-0400)
Subject: ci: Bump dependencies in github actions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3505%2Fhead;p=thirdparty%2Ftornado.git

ci: Bump dependencies in github actions
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6dd9306b..3e3894a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ env:
 jobs:
   build_sdist:
     name: Build sdist
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -35,6 +35,8 @@ jobs:
         with:
           python-version: ${{ env.python-version }}
 
+      - name: Install dependencies
+        run: python -m pip install setuptools
       - name: Check metadata
         run: "python setup.py check"
       - name: Build sdist
@@ -51,7 +53,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2022, macos-15]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2025, macos-15]
 
     steps:
       - uses: actions/checkout@v4
@@ -63,7 +65,7 @@ jobs:
           python-version: ${{ env.python-version }}
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.22
+        uses: pypa/cibuildwheel@v2.23
 
       - name: Audit ABI3 compliance
         # This may be moved into cibuildwheel itself in the future. See
@@ -78,7 +80,7 @@ jobs:
   upload_pypi_test:
     name: Upload to PyPI (test)
     needs: [build_wheels, build_sdist]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'tornadoweb/tornado' && github.event_name == 'workflow_dispatch'
     permissions:
       # This permission is required for pypi's "trusted publisher" feature
@@ -98,7 +100,7 @@ jobs:
   upload_pypi:
     name: Upload to PyPI (prod)
     needs: [build_wheels, build_sdist]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.repository == 'tornadoweb/tornado' && github.event_name == 'push' && github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
     permissions:
       # This permission is required for pypi's "trusted publisher" feature
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f7362804..3f65228c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
   # first-time contributors).
   test_quick:
     name: Run quick tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -36,7 +36,7 @@ jobs:
   test_tox:
     name: Run full tests
     needs: test_quick
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
@@ -91,7 +91,7 @@ jobs:
     # enough that we'll break it if we don't test it in CI.
     name: Run windows tests
     needs: test_quick
-    runs-on: windows-2022
+    runs-on: windows-2025
     steps:
       - uses: actions/checkout@v4
         with:
@@ -106,13 +106,13 @@ jobs:
 
   zizmor:
     name: Analyze action configs with zizmor
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: test_quick
     steps:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
-      - uses: astral-sh/setup-uv@v5
+      - uses: astral-sh/setup-uv@v6
         name: Install uv
       - name: Run zizmor
         run: uvx zizmor .github/workflows
@@ -127,14 +127,14 @@ jobs:
     # test_tox with test_cibw would entail either increasing test runtime or reducing
     # test coverage.
     name: Test with cibuildwheel
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: test_quick
     steps:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
       - name: Run cibuildwheel
-        uses: pypa/cibuildwheel@v2.22
+        uses: pypa/cibuildwheel@v2.23
         env:
           # For speed, we only build one python version and one arch. We throw away the wheels
           # built here; the real build is defined in build.yml.