Skip to content

Commit 157e3d1

Browse files
alexreaperhulk
andauthored
refs #11199 attempt to test on windows arm64 (#12770)
* refs #11199 attempt to test on windows arm64 * Update ci.yml * ...sure * Update ci.yml * get back to our desired test state * oops, too old * GHA * fix? * build wheels * document in installation --------- Co-authored-by: Paul Kehrer <[email protected]>
1 parent db0dbf6 commit 157e3d1

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,16 +346,21 @@ jobs:
346346
- uses: ./.github/actions/upload-coverage
347347

348348
windows:
349-
runs-on: windows-latest
349+
runs-on: ${{ matrix.WINDOWS.RUNNER }}
350350
strategy:
351351
fail-fast: false
352352
matrix:
353353
WINDOWS:
354-
- {ARCH: 'x86', WINDOWS: 'win32'}
355-
- {ARCH: 'x64', WINDOWS: 'win64'}
354+
- {ARCH: 'x86', WINDOWS: 'win32', RUNNER: 'windows-latest'}
355+
- {ARCH: 'x64', WINDOWS: 'win64', RUNNER: 'windows-latest'}
356356
PYTHON:
357357
- {VERSION: "3.8", NOXSESSION: "tests-nocoverage"}
358358
- {VERSION: "3.13", NOXSESSION: "tests"}
359+
include:
360+
# Not in the main matrix because we want tests-nocoverage on Python
361+
# 3.13
362+
- PYTHON: {VERSION: "3.13", NOXSESSION: "tests-nocoverage"}
363+
WINDOWS: {ARCH: 'arm64', WINDOWS: 'arm64', RUNNER: 'windows-11-arm'}
359364
timeout-minutes: 15
360365
steps:
361366
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/wheel-builder.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,14 @@ jobs:
300300

301301
windows:
302302
needs: [sdist]
303-
runs-on: windows-latest
303+
runs-on: ${{ matrix.WINDOWS.RUNNER }}
304304
strategy:
305305
fail-fast: false
306306
matrix:
307307
WINDOWS:
308-
- {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
309-
- {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'}
308+
- {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc', RUNNER: 'windows-latest'}
309+
- {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc', RUNNER: 'windows-latest'}
310+
- {ARCH: 'arm64', WINDOWS: 'arm64', RUST_TRIPLE: 'aarch64-pc-windows-msvc', RUNNER: 'windows-11-arm'}
310311
PYTHON:
311312
- {VERSION: "3.11", "ABI_VERSION": "py38"}
312313
- {VERSION: "3.11", "ABI_VERSION": "py311"}
@@ -318,6 +319,11 @@ jobs:
318319
PYTHON: {VERSION: "pypy-3.10"}
319320
- WINDOWS: {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
320321
PYTHON: {VERSION: "pypy-3.11"}
322+
# We need to exclude the below configuration because there is no ARM64 pypy3
323+
- WINDOWS: {ARCH: 'arm64', WINDOWS: 'arm64', RUST_TRIPLE: 'aarch64-pc-windows-msvc', RUNNER: 'windows-11-arm'}
324+
PYTHON: {VERSION: "pypy-3.10"}
325+
- WINDOWS: {ARCH: 'arm64', WINDOWS: 'arm64', RUST_TRIPLE: 'aarch64-pc-windows-msvc', RUNNER: 'windows-11-arm'}
326+
PYTHON: {VERSION: "pypy-3.11"}
321327
name: "${{ matrix.PYTHON.VERSION }} ${{ matrix.WINDOWS.WINDOWS }} ${{ matrix.PYTHON.ABI_VERSION }}"
322328
steps:
323329
- name: Get build-requirements.txt from repository

docs/installation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ operating systems.
3535
Sid (unstable)
3636
* x86-64 and ARM64 Alpine (latest)
3737
* 32-bit and 64-bit Python on 64-bit Windows Server 2022
38+
* ARM64 Windows 11
3839

3940
We test compiling with ``clang`` as well as ``gcc`` and use the following
4041
OpenSSL releases in addition to distribution provided releases from the

0 commit comments

Comments
 (0)