File tree 5 files changed +12
-45
lines changed 5 files changed +12
-45
lines changed Original file line number Diff line number Diff line change 1
1
self-hosted-runner :
2
- labels : ["windows-aarch64"]
2
+ # Pending https://github.com/rhysd/actionlint/issues/533
3
+ labels : ["windows-11-arm"]
3
4
4
5
config-variables : null
5
6
Original file line number Diff line number Diff line change @@ -156,28 +156,18 @@ jobs:
156
156
strategy :
157
157
fail-fast : false
158
158
matrix :
159
- os :
160
- - windows-latest
161
159
arch :
162
160
- x64
161
+ - Win32
162
+ - arm64
163
163
free-threading :
164
164
- false
165
165
- true
166
- include :
167
- # Forks don't have access to Windows on Arm runners. These jobs are skipped below:
168
- - os : ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
169
- arch : arm64
170
- free-threading : false
171
- # Forks don't have access to Windows on Arm runners. These jobs are skipped below:
172
- - os : ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
173
- arch : arm64
174
- free-threading : true
175
- - os : windows-latest
176
- arch : Win32
177
- free-threading : false
166
+ exclude :
167
+ # Skip Win32 on free-threaded builds
168
+ - { arch: Win32, free-threading: true }
178
169
uses : ./.github/workflows/reusable-windows.yml
179
170
with :
180
- os : ${{ matrix.os }}
181
171
arch : ${{ matrix.arch }}
182
172
free-threading : ${{ matrix.free-threading }}
183
173
@@ -189,18 +179,12 @@ jobs:
189
179
strategy :
190
180
fail-fast : false
191
181
matrix :
192
- os :
193
- - windows-latest
194
182
arch :
195
183
- x86
196
184
- x64
197
- include :
198
- # Forks don't have access to Windows on Arm runners. These jobs are skipped below:
199
- - os : ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
200
- arch : arm64
185
+ - arm64
201
186
uses : ./.github/workflows/reusable-windows-msi.yml
202
187
with :
203
- os : ${{ matrix.os }}
204
188
arch : ${{ matrix.arch }}
205
189
206
190
build-macos :
Original file line number Diff line number Diff line change 74
74
runner : windows-latest
75
75
- target : aarch64-pc-windows-msvc/msvc
76
76
architecture : ARM64
77
- # Forks don't have access to Windows on Arm runners. These jobs are skipped below:
78
- runner : ${{ github.repository_owner == 'python' && 'windows-aarch64' || 'windows-latest' }}
77
+ runner : windows-11-arm
79
78
- target : x86_64-apple-darwin/clang
80
79
architecture : x86_64
81
80
runner : macos-13
97
96
python-version : ' 3.11'
98
97
99
98
- name : Windows
100
- # Forks don't have access to Windows on Arm runners. Skip those:
101
- if : runner.os == 'Windows' && (matrix.architecture != 'ARM64' || github.repository_owner == 'python')
99
+ if : runner.os == 'Windows'
102
100
run : |
103
101
choco install llvm --allow-downgrade --no-progress --version ${{ matrix.llvm }}.1.0
104
102
./PCbuild/build.bat --experimental-jit ${{ matrix.debug && '-d' || '' }} -p ${{ matrix.architecture }}
Original file line number Diff line number Diff line change @@ -3,10 +3,6 @@ name: Reusable Windows MSI
3
3
on :
4
4
workflow_call :
5
5
inputs :
6
- os :
7
- description : OS to run on
8
- required : true
9
- type : string
10
6
arch :
11
7
description : CPU architecture
12
8
required : true
21
17
jobs :
22
18
build :
23
19
name : installer for ${{ inputs.arch }}
24
- runs-on : ${{ inputs.os }}
20
+ runs-on : ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }}
25
21
timeout-minutes : 60
26
22
env :
27
23
ARCH : ${{ inputs.arch }}
31
27
with :
32
28
persist-credentials : false
33
29
- 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'
36
30
run : ./Tools/msi/build.bat --doc -"${ARCH}"
37
31
shell : bash
Original file line number Diff line number Diff line change @@ -3,10 +3,6 @@ name: Reusable Windows
3
3
on :
4
4
workflow_call :
5
5
inputs :
6
- os :
7
- description : OS to run on
8
- required : true
9
- type : string
10
6
arch :
11
7
description : CPU architecture
12
8
required : true
25
21
jobs :
26
22
build :
27
23
name : Build and test (${{ inputs.arch }})
28
- runs-on : ${{ inputs.os }}
24
+ runs-on : ${{ inputs.arch == 'arm64' && 'windows-11-arm' || 'windows-latest' }}
29
25
timeout-minutes : 60
30
26
env :
31
27
ARCH : ${{ inputs.arch }}
@@ -37,21 +33,15 @@ jobs:
37
33
if : inputs.arch != 'Win32'
38
34
run : echo "::add-matcher::.github/problem-matchers/msvc.json"
39
35
- name : Build CPython
40
- # Forks don't have access to Windows on Arm runners. Skip those:
41
- if : inputs.arch != 'arm64' || github.repository_owner == 'python'
42
36
run : >-
43
37
.\\PCbuild\\build.bat
44
38
-e -d -v
45
39
-p "${ARCH}"
46
40
${{ fromJSON(inputs.free-threading) && '--disable-gil' || '' }}
47
41
shell : bash
48
42
- name : Display build info
49
- # Forks don't have access to Windows on Arm runners. Skip those:
50
- if : inputs.arch != 'arm64' || github.repository_owner == 'python'
51
43
run : .\\python.bat -m test.pythoninfo
52
44
- name : Tests
53
- # Forks don't have access to Windows on Arm runners. Skip those:
54
- if : inputs.arch != 'arm64' || github.repository_owner == 'python'
55
45
run : >-
56
46
.\\PCbuild\\rt.bat
57
47
-p "${ARCH}"
You can’t perform that action at this time.
0 commit comments