Skip to content

Commit fcbe06f

Browse files
committed
Use Windows arm64 hosted runners for build-windows-msi
1 parent 70422f1 commit fcbe06f

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -179,18 +179,12 @@ jobs:
179179
strategy:
180180
fail-fast: false
181181
matrix:
182-
os:
183-
- windows-latest
184182
arch:
185183
- x86
186184
- x64
187-
include:
188-
# Forks don't have access to Windows on Arm runners. These jobs are skipped below:
189-
- os: ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
190-
arch: arm64
185+
- arm64
191186
uses: ./.github/workflows/reusable-windows-msi.yml
192187
with:
193-
os: ${{ matrix.os }}
194188
arch: ${{ matrix.arch }}
195189

196190
build-macos:

.github/workflows/reusable-windows-msi.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ name: Reusable Windows MSI
33
on:
44
workflow_call:
55
inputs:
6-
os:
7-
description: OS to run on
8-
required: true
9-
type: string
106
arch:
117
description: CPU architecture
128
required: true
@@ -21,7 +17,7 @@ env:
2117
jobs:
2218
build:
2319
name: installer for ${{ inputs.arch }}
24-
runs-on: ${{ inputs.os }}
20+
runs-on: ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }}
2521
timeout-minutes: 60
2622
env:
2723
ARCH: ${{ inputs.arch }}
@@ -31,7 +27,5 @@ jobs:
3127
with:
3228
persist-credentials: false
3329
- name: Build CPython installer
34-
# Forks don't have access to Windows on Arm runners. Skip those:
35-
if: inputs.arch != 'arm64' || github.repository_owner == 'python'
3630
run: ./Tools/msi/build.bat --doc -"${ARCH}"
3731
shell: bash

0 commit comments

Comments
 (0)