Skip to content

Commit 5971b2e

Browse files
authored
Merge pull request #3383 from bdarnell/ci-update
ci: Update action versions for node deprecation
2 parents b109915 + b2431b2 commit 5971b2e

File tree

2 files changed

+32
-27
lines changed

2 files changed

+32
-27
lines changed

.github/workflows/build.yml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
name: Build sdist
2626
runs-on: ubuntu-22.04
2727
steps:
28-
- uses: actions/checkout@v3
29-
- uses: actions/setup-python@v4
28+
- uses: actions/checkout@v4
29+
- uses: actions/setup-python@v5
3030
name: Install Python
3131
with:
3232
python-version: ${{ env.python-version }}
@@ -36,8 +36,9 @@ jobs:
3636
- name: Build sdist
3737
run: "python setup.py sdist && ls -l dist"
3838

39-
- uses: actions/upload-artifact@v3
39+
- uses: actions/upload-artifact@v4
4040
with:
41+
name: artifacts-sdist
4142
path: ./dist/tornado-*.tar.gz
4243

4344
build_wheels:
@@ -49,54 +50,58 @@ jobs:
4950
os: [ubuntu-22.04, windows-2022, macos-12]
5051

5152
steps:
52-
- uses: actions/checkout@v3
53-
- uses: actions/setup-python@v4
53+
- uses: actions/checkout@v4
54+
- uses: actions/setup-python@v5
5455
name: Install Python
5556
with:
5657
python-version: ${{ env.python-version }}
5758
- name: Set up QEMU
5859
if: runner.os == 'Linux'
59-
uses: docker/setup-qemu-action@v2
60+
uses: docker/setup-qemu-action@v3
6061
with:
6162
platforms: all
6263

6364
- name: Build wheels
64-
uses: pypa/cibuildwheel@v2.12.1
65+
uses: pypa/cibuildwheel@v2.18
6566

66-
- uses: actions/upload-artifact@v3
67+
- uses: actions/upload-artifact@v4
6768
with:
69+
name: artifacts-${{ matrix.os }}
6870
path: ./wheelhouse/*.whl
6971

7072
upload_pypi_test:
7173
name: Upload to PyPI (test)
7274
needs: [build_wheels, build_sdist]
7375
runs-on: ubuntu-22.04
7476
if: github.repository == 'tornadoweb/tornado' && github.event_name == 'workflow_dispatch'
77+
permissions:
78+
# This permission is required for pypi's "trusted publisher" feature
79+
id-token: write
7580
steps:
76-
- uses: actions/download-artifact@v3
81+
- uses: actions/download-artifact@v4
7782
with:
78-
name: artifact
83+
pattern: artifacts-*
7984
path: dist
85+
merge-multiple: true
8086

81-
- uses: pypa/gh-action-pypi-publish@v1.5.0
87+
- uses: pypa/gh-action-pypi-publish@release/v1
8288
with:
83-
user: __token__
84-
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
85-
repository_url: https://test.pypi.org/legacy/
86-
skip_existing: true
89+
repository-url: https://test.pypi.org/legacy/
90+
skip-existing: true
8791

8892
upload_pypi:
8993
name: Upload to PyPI (prod)
9094
needs: [build_wheels, build_sdist]
9195
runs-on: ubuntu-22.04
9296
if: github.repository == 'tornadoweb/tornado' && github.event_name == 'push' && github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
97+
permissions:
98+
# This permission is required for pypi's "trusted publisher" feature
99+
id-token: write
93100
steps:
94-
- uses: actions/download-artifact@v3
101+
- uses: actions/download-artifact@v4
95102
with:
96-
name: artifact
103+
pattern: artifacts-*
97104
path: dist
105+
merge-multiple: true
98106

99-
- uses: pypa/gh-action-pypi-publish@v1.5.0
100-
with:
101-
user: __token__
102-
password: ${{ secrets.PYPI_API_TOKEN }}
107+
- uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
name: Run quick tests
1818
runs-on: ubuntu-22.04
1919
steps:
20-
- uses: actions/checkout@v3
21-
- uses: actions/setup-python@v4
20+
- uses: actions/checkout@v4
21+
- uses: actions/setup-python@v5
2222
name: Install Python
2323
with:
2424
# Lint python version must be synced with tox.ini
@@ -62,8 +62,8 @@ jobs:
6262
tox_env: docs
6363

6464
steps:
65-
- uses: actions/checkout@v3
66-
- uses: actions/setup-python@v4
65+
- uses: actions/checkout@v4
66+
- uses: actions/setup-python@v5
6767
name: Install Python
6868
with:
6969
python-version: ${{ matrix.python}}
@@ -85,8 +85,8 @@ jobs:
8585
needs: test_quick
8686
runs-on: windows-2022
8787
steps:
88-
- uses: actions/checkout@v3
89-
- uses: actions/setup-python@v4
88+
- uses: actions/checkout@v4
89+
- uses: actions/setup-python@v5
9090
name: Install Python
9191
with:
9292
python-version: '3.11'

0 commit comments

Comments
 (0)