Skip to content

Commit 58b76b0

Browse files
Merge branch '3.10' into backport-5a4c4a0-3.10
2 parents b3a7998 + f12346d commit 58b76b0

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run_tests: ${{ steps.check.outputs.run_tests }}
3131
run_ssl_tests: ${{ steps.check.outputs.run_ssl_tests }}
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v6
3434
- name: Check for source changes
3535
id: check
3636
run: |
@@ -62,10 +62,10 @@ jobs:
6262
needs: check_source
6363
if: needs.check_source.outputs.run_tests == 'true'
6464
steps:
65-
- uses: actions/checkout@v4
65+
- uses: actions/checkout@v6
6666
with:
6767
persist-credentials: false
68-
- uses: actions/setup-python@v5
68+
- uses: actions/setup-python@v6
6969
- name: Install dependencies
7070
run: |
7171
sudo ./.github/workflows/posix-deps-apt.sh
@@ -97,10 +97,10 @@ jobs:
9797
needs: check_source
9898
if: needs.check_source.outputs.run_tests == 'true'
9999
steps:
100-
- uses: actions/checkout@v4
100+
- uses: actions/checkout@v6
101101
with:
102102
persist-credentials: false
103-
- uses: actions/setup-python@v5
103+
- uses: actions/setup-python@v6
104104
- name: Install dependencies
105105
run: sudo ./.github/workflows/posix-deps-apt.sh
106106
- name: Add ccache to PATH
@@ -149,7 +149,7 @@ jobs:
149149
env:
150150
IncludeUwp: 'true'
151151
steps:
152-
- uses: actions/checkout@v4
152+
- uses: actions/checkout@v6
153153
- name: Build CPython
154154
run: .\PCbuild\build.bat -e -p Win32
155155
- name: Display build info
@@ -165,7 +165,7 @@ jobs:
165165
env:
166166
IncludeUwp: 'true'
167167
steps:
168-
- uses: actions/checkout@v4
168+
- uses: actions/checkout@v6
169169
- name: Register MSVC problem matcher
170170
run: echo "::add-matcher::.github/problem-matchers/msvc.json"
171171
- name: Build CPython
@@ -186,7 +186,7 @@ jobs:
186186
HOMEBREW_NO_INSTALL_CLEANUP: 1
187187
PYTHONSTRICTEXTENSIONBUILD: 1
188188
steps:
189-
- uses: actions/checkout@v4
189+
- uses: actions/checkout@v6
190190
- name: Install Homebrew dependencies
191191
run: |
192192
brew install pkg-config openssl@3.0 xz gdbm tcl-tk@8
@@ -218,7 +218,7 @@ jobs:
218218
OPENSSL_VER: 3.0.11
219219
PYTHONSTRICTEXTENSIONBUILD: 1
220220
steps:
221-
- uses: actions/checkout@v4
221+
- uses: actions/checkout@v6
222222
- name: Register gcc problem matcher
223223
run: echo "::add-matcher::.github/problem-matchers/gcc.json"
224224
- name: Install dependencies
@@ -230,7 +230,7 @@ jobs:
230230
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> "$GITHUB_ENV"
231231
- name: 'Restore OpenSSL build'
232232
id: cache-openssl
233-
uses: actions/cache@v4
233+
uses: actions/cache@v5
234234
with:
235235
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
236236
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}
@@ -267,7 +267,7 @@ jobs:
267267
OPENSSL_DIR: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}
268268
LD_LIBRARY_PATH: ${{ github.workspace }}/multissl/openssl/${{ matrix.openssl_ver }}/lib
269269
steps:
270-
- uses: actions/checkout@v4
270+
- uses: actions/checkout@v6
271271
with:
272272
persist-credentials: false
273273
- name: Register gcc problem matcher
@@ -281,7 +281,7 @@ jobs:
281281
echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> "$GITHUB_ENV"
282282
- name: 'Restore OpenSSL build'
283283
id: cache-openssl
284-
uses: actions/cache@v4
284+
uses: actions/cache@v5
285285
with:
286286
path: ./multissl/openssl/${{ env.OPENSSL_VER }}
287287
key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

.github/workflows/build_msi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ jobs:
3434
name: 'Windows (x86) Installer'
3535
runs-on: windows-2022
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
3838
- name: Build CPython installer
3939
run: .\Tools\msi\build.bat --doc -x86
4040

4141
build_win_amd64:
4242
name: 'Windows (x64) Installer'
4343
runs-on: windows-2022
4444
steps:
45-
- uses: actions/checkout@v4
45+
- uses: actions/checkout@v6
4646
- name: Build CPython installer
4747
run: .\Tools\msi\build.bat --doc -x64

.github/workflows/doc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
name: 'Docs'
3333
runs-on: ubuntu-latest
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
3636
- name: Register Sphinx problem matcher
3737
run: echo "::add-matcher::.github/problem-matchers/sphinx.json"
3838
- name: 'Set up Python'
39-
uses: actions/setup-python@v4
39+
uses: actions/setup-python@v6
4040
with:
4141
python-version: '3.12'
4242
cache: 'pip'
@@ -46,7 +46,7 @@ jobs:
4646
- name: 'Build HTML documentation'
4747
run: make -C Doc/ SPHINXOPTS="-q" SPHINXERRORHANDLING="-W --keep-going" html
4848
- name: 'Upload'
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v6
5050
with:
5151
name: doc-html
5252
path: Doc/build/html
@@ -58,10 +58,10 @@ jobs:
5858
name: 'Doctest'
5959
runs-on: ubuntu-latest
6060
steps:
61-
- uses: actions/checkout@v4
61+
- uses: actions/checkout@v6
6262
- name: Register Sphinx problem matcher
6363
run: echo "::add-matcher::.github/problem-matchers/sphinx.json"
64-
- uses: actions/cache@v3
64+
- uses: actions/cache@v5
6565
with:
6666
path: ~/.cache/pip
6767
key: ubuntu-doc-${{ hashFiles('Doc/requirements.txt') }}

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: "Check PRs"
17-
uses: actions/stale@v5
17+
uses: actions/stale@v9
1818
with:
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}
2020
stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity.'

.github/workflows/verify-ensurepip-wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
verify:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v4
28-
- uses: actions/setup-python@v4
27+
- uses: actions/checkout@v6
28+
- uses: actions/setup-python@v6
2929
with:
3030
python-version: '3'
3131
- name: Compare checksums of bundled pip and setuptools to ones published on PyPI

0 commit comments

Comments
 (0)