Skip to content

Commit e53ce71

Browse files
committed
Merge branch '3.14' into pr-145397
2 parents 48c09f4 + 74d104d commit e53ce71

File tree

327 files changed

+11987
-7487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

327 files changed

+11987
-7487
lines changed

.github/actionlint.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
self-hosted-runner:
2-
# Pending https://github.com/rhysd/actionlint/issues/533
3-
# and https://github.com/rhysd/actionlint/issues/571
4-
labels: ["windows-11-arm", "macos-15-intel"]
5-
61
config-variables: null
72

83
paths:

.github/workflows/build.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install dependencies
6565
run: |
6666
sudo ./.github/workflows/posix-deps-apt.sh
67-
sudo apt-get install -yq abigail-tools
67+
sudo apt-get install -yq --no-install-recommends abigail-tools
6868
- name: Build CPython
6969
env:
7070
CFLAGS: -g3 -O0
@@ -158,8 +158,6 @@ jobs:
158158
run: echo "IMAGE_OS_VERSION=${ImageOS}-${ImageVersion}" >> "$GITHUB_ENV"
159159
- name: Install dependencies
160160
run: sudo ./.github/workflows/posix-deps-apt.sh
161-
- name: Add ccache to PATH
162-
run: echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
163161
- name: Configure CPython
164162
run: |
165163
# Build Python with the libpython dynamic library
@@ -443,9 +441,6 @@ jobs:
443441
- name: Install OpenSSL
444442
if: steps.cache-openssl.outputs.cache-hit != 'true'
445443
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
446-
- name: Add ccache to PATH
447-
run: |
448-
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
449444
- name: Setup directory envs for out-of-tree builds
450445
run: |
451446
echo "CPYTHON_RO_SRCDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-ro-srcdir)" >> "$GITHUB_ENV"
@@ -561,9 +556,6 @@ jobs:
561556
- name: Install OpenSSL
562557
if: steps.cache-openssl.outputs.cache-hit != 'true'
563558
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
564-
- name: Add ccache to PATH
565-
run: |
566-
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
567559
- name: Configure CPython
568560
run: ./configure --config-cache --with-address-sanitizer --without-pymalloc
569561
- name: Build CPython

.github/workflows/posix-deps-apt.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/bin/sh
22
apt-get update
33

4-
apt-get -yq install \
4+
apt-get -yq --no-install-recommends install \
55
build-essential \
66
pkg-config \
7-
ccache \
87
gdb \
98
lcov \
109
libb2-dev \

.github/workflows/regen-abidump.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ set -ex
22

33
export DEBIAN_FRONTEND=noninteractive
44
./.github/workflows/posix-deps-apt.sh
5-
apt-get install -yq abigail-tools python3
5+
apt-get install -yq --no-install-recommends abigail-tools python3
66
export CFLAGS="-g3 -O0"
77
./configure --enable-shared && make
88
make regen-abidump

.github/workflows/reusable-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
restore-keys: |
9393
ubuntu-doc-
9494
- name: 'Install Dependencies'
95-
run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install wamerican
95+
run: sudo ./.github/workflows/posix-deps-apt.sh && sudo apt-get install --no-install-recommends wamerican
9696
- name: 'Configure CPython'
9797
run: ./configure --with-pydebug
9898
- name: 'Build CPython'

.github/workflows/reusable-san.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ jobs:
6666
env:
6767
SANITIZER: ${{ inputs.sanitizer }}
6868
SAN_LOG_OPTION: log_path=${{ github.workspace }}/san_log
69-
- name: Add ccache to PATH
70-
run: |
71-
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
7269
- name: Configure CPython
7370
run: >-
7471
./configure

.github/workflows/reusable-ubuntu.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: ${{ fromJSON(inputs.bolt-optimizations) }}
4343
run: |
4444
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" ./llvm.sh 19
45-
sudo apt-get install bolt-19
45+
sudo apt-get install --no-install-recommends bolt-19
4646
echo PATH="$(llvm-config-19 --bindir):$PATH" >> $GITHUB_ENV
4747
- name: Configure OpenSSL env vars
4848
run: |
@@ -58,9 +58,6 @@ jobs:
5858
- name: Install OpenSSL
5959
if: steps.cache-openssl.outputs.cache-hit != 'true'
6060
run: python3 Tools/ssl/multissltests.py --steps=library --base-directory "$MULTISSL_DIR" --openssl "$OPENSSL_VER" --system Linux
61-
- name: Add ccache to PATH
62-
run: |
63-
echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
6461
- name: Setup directory envs for out-of-tree builds
6562
run: |
6663
echo "CPYTHON_RO_SRCDIR=$(realpath -m "${GITHUB_WORKSPACE}"/../cpython-ro-srcdir)" >> "$GITHUB_ENV"

.github/workflows/reusable-wasi.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ jobs:
3838
mkdir "${WASI_SDK_PATH}" && \
3939
curl -s -S --location "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux.tar.gz" | \
4040
tar --strip-components 1 --directory "${WASI_SDK_PATH}" --extract --gunzip
41-
- name: "Add ccache to PATH"
42-
run: echo "PATH=/usr/lib/ccache:$PATH" >> "$GITHUB_ENV"
4341
- name: "Install Python"
4442
uses: actions/setup-python@v6
4543
with:

.github/workflows/verify-expat.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Verify bundled libexpat
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- 'Modules/expat/**'
8+
- '.github/workflows/verify-expat.yml'
9+
pull_request:
10+
paths:
11+
- 'Modules/expat/**'
12+
- '.github/workflows/verify-expat.yml'
13+
14+
permissions:
15+
contents: read
16+
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
verify:
23+
runs-on: ubuntu-latest
24+
timeout-minutes: 5
25+
steps:
26+
- uses: actions/checkout@v6
27+
with:
28+
persist-credentials: false
29+
- name: Download and verify bundled libexpat files
30+
run: |
31+
./Modules/expat/refresh.sh
32+
git diff --exit-code Modules/expat/

.github/zizmor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Configuration for the zizmor static analysis tool, run via prek in CI
2-
# https://woodruffw.github.io/zizmor/configuration/
2+
# https://docs.zizmor.sh/configuration/
33
rules:
44
dangerous-triggers:
55
ignore:

0 commit comments

Comments
 (0)