Skip to content

Commit 8e32bc6

Browse files
committed
x64 Python on ARM64 windows
1 parent 9cfe3b6 commit 8e32bc6

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,17 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
26-
architecture: [x64, x86, arm64]
27-
include:
28-
- architecture: arm64
29-
os: windows-11-arm
30-
- os: windows-2019
26+
# CPython has no ARM distribution until 3.11
27+
python-architecture: [x64, x86]
28+
os: [windows-2019, windows-11-arm]
29+
exclude:
30+
- os: windows-11-arm
31+
architecture: x86
32+
# python-architecture: [x64, x86, arm64]
33+
# include:
34+
# - architecture: arm64
35+
# os: windows-11-arm
36+
# - os: windows-2019
3137

3238
steps:
3339
- uses: actions/checkout@v4
@@ -36,13 +42,13 @@ jobs:
3642
uses: actions/setup-python@v5
3743
with:
3844
python-version: ${{ matrix.python-version }}
39-
architecture: ${{ matrix.architecture }}
45+
architecture: ${{ matrix.python-architecture }}
4046
cache: pip
4147
cache-dependency-path: .github/workflows/main.yml
4248
check-latest: true
4349

4450
- name: Fix user Scripts missing from PATH
45-
if: matrix.architecture == 'x86'
51+
if: matrix.python-architecture == 'x86'
4652
run: |
4753
# Work around https://github.com/actions/setup-python/issues/1005
4854
$ScriptsPath = python -c "import sysconfig,os; print(sysconfig.get_path('scripts', f'{os.name}_user'))"
@@ -73,6 +79,7 @@ jobs:
7379
# See https://github.com/actions/runner-images/issues/9701
7480
# Adapted from https://github.com/actions/runner-images/issues/9873#issuecomment-2139288682
7581
- name: Install missing Visual Studio components
82+
if: matrix.os != 'windows-2019' # Only an issue on newer versions of Windows
7683
run: |
7784
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
7885
$VsInstallPath = vswhere.exe -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
@@ -103,7 +110,7 @@ jobs:
103110
# Upload artifacts even if tests fail
104111
if: ${{ always() }}
105112
with:
106-
name: artifacts-${{ matrix.python-version }}-${{ matrix.architecture }}-${{ matrix.os }}
113+
name: artifacts-${{ matrix.python-version }}-${{ matrix.python-architecture }}-${{ matrix.os }}
107114
path: dist/*.whl
108115
if-no-files-found: error
109116

0 commit comments

Comments
 (0)