Skip to content

Commit d92390e

Browse files
authored
Merge pull request #3464 from bdarnell/actions
ci: Use native arm builders
2 parents 641f0c2 + ac76b7a commit d92390e

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
os: [ubuntu-22.04, windows-2022, macos-15]
54+
os: [ubuntu-22.04, ubuntu-22.04-arm, windows-2022, macos-15]
5555

5656
steps:
5757
- uses: actions/checkout@v4
@@ -61,14 +61,9 @@ jobs:
6161
name: Install Python
6262
with:
6363
python-version: ${{ env.python-version }}
64-
- name: Set up QEMU
65-
if: runner.os == 'Linux'
66-
uses: docker/setup-qemu-action@v3
67-
with:
68-
platforms: all
6964

7065
- name: Build wheels
71-
uses: pypa/cibuildwheel@v2.18
66+
uses: pypa/cibuildwheel@v2.22
7267

7368
- name: Audit ABI3 compliance
7469
# This may be moved into cibuildwheel itself in the future. See

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
zizmor:
110110
name: Analyze action configs with zizmor
111111
runs-on: ubuntu-22.04
112+
needs: test_quick
112113
steps:
113114
- uses: actions/checkout@v4
114115
with:

pyproject.toml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,21 @@ test-command = "python -m tornado.test"
1111

1212
[tool.cibuildwheel.macos]
1313
archs = "x86_64 universal2"
14-
# The arm portion of a universal wheel is a cross-compile and cannot
15-
# be tested on an x86 host. This must be configured explicitly to silence
16-
# a warning.
17-
test-skip = "*_universal2:arm64"
1814

1915
[tool.cibuildwheel.windows]
2016
archs = "AMD64 x86 ARM64"
2117
# TODO: figure out what's going on with these occasional log messages.
2218
test-command = "python -m tornado.test --fail-if-logs=false"
19+
# Arm builds are cross-compiled and cannot be tested on the x86 host
2320
test-skip = "*-win_arm64"
2421

2522
[tool.cibuildwheel.linux]
26-
# Build wheels for the native platform (i.e. x86) as well as an emulated
27-
# build for aarch64.
28-
archs = "auto aarch64"
29-
30-
[[tool.cibuildwheel.overrides]]
31-
# The emulated arm build is quite slow, so only run a portion of the test
32-
# suite. websocket_test is the most platform-dependent part of the tests
33-
# because it uses the C speedups module.
34-
select = "*linux_aarch64"
35-
test-command = "python -m tornado.test tornado.test.websocket_test"
23+
# This configuration has a bug which appears unrelated to Tornado:
24+
# https://github.com/python/cpython/issues/130522
25+
# If the underlying bug is not fixed by the time 3.14 is released,
26+
# we may need to skip that in musllinux_i686 as well.
27+
#
28+
# Note that because we use the stable ABI, the wheels built for
29+
# cp39-musllinux_i686 will still be available for users of 3.13, this just
30+
# means we won't be testing them in this configuration.
31+
test-skip = "cp313-musllinux_i686"

0 commit comments

Comments
 (0)