Skip to content

Commit f7204c3

Browse files
zoobazooba
committed
Update release machines to windows-2025
1 parent c6a4d1e commit f7204c3

20 files changed

+165
-27
lines changed

‎windows-release/azure-pipelines.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ parameters:
116116
displayName: "Build the JIT compiler for free-threaded builds (not used yet)"
117117
type: boolean
118118
default: false
119+
- name: vmImage
120+
displayName: "VM Image"
121+
type: object
122+
default: windows-2025
123+
- name: vmImageArm64
124+
displayName: "VM Image (ARM64)"
125+
type: object
126+
default: windows-11-arm
119127

120128
resources:
121129
pipelines:
@@ -159,6 +167,7 @@ stages:
159167
jobs:
160168
- template: stage-build.yml
161169
parameters:
170+
pool: ${{ parameters.vmImage }}
162171
DoFreethreaded: ${{ parameters.DoFreethreaded }}
163172
DoPGO: ${{ parameters.DoPGO }}
164173
DoPGOARM64: ${{ parameters.DoPGOARM64 }}
@@ -183,6 +192,7 @@ stages:
183192
jobs:
184193
- template: stage-sign.yml
185194
parameters:
195+
pool: ${{ parameters.vmImage }}
186196
SigningCertificate: ${{ parameters.SigningCertificate }}
187197
DoFreethreaded: ${{ parameters.DoFreethreaded }}
188198

@@ -197,33 +207,39 @@ stages:
197207
jobs:
198208
- template: stage-layout-full.yml
199209
parameters:
210+
pool: ${{ parameters.vmImage }}
200211
BuildToPackage: ${{ parameters.BuildToPackage }}
201212
DoFreethreaded: ${{ parameters.DoFreethreaded }}
202213
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
203214
- template: stage-layout-symbols.yml
204215
parameters:
216+
pool: ${{ parameters.vmImage }}
205217
BuildToPackage: ${{ parameters.BuildToPackage }}
206218
DoFreethreaded: ${{ parameters.DoFreethreaded }}
207219
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
208220
- ${{ if eq(parameters.DoEmbed, 'true') }}:
209221
- template: stage-layout-embed.yml
210222
parameters:
223+
pool: ${{ parameters.vmImage }}
211224
BuildToPackage: ${{ parameters.BuildToPackage }}
212225
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
213226
- ${{ if eq(parameters.DoNuget, 'true') }}:
214227
- template: stage-layout-nuget.yml
215228
parameters:
229+
pool: ${{ parameters.vmImage }}
216230
BuildToPackage: ${{ parameters.BuildToPackage }}
217231
DoFreethreaded: ${{ parameters.DoFreethreaded }}
218232
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
219233
- ${{ if eq(parameters.DoMSIX, 'true') }}:
220234
- template: stage-layout-msix.yml
221235
parameters:
236+
pool: ${{ parameters.vmImage }}
222237
BuildToPackage: ${{ parameters.BuildToPackage }}
223238
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
224239
- ${{ if eq(parameters.DoPyManager, 'true') }}:
225240
- template: stage-layout-pymanager.yml
226241
parameters:
242+
pool: ${{ parameters.vmImage }}
227243
BuildToPackage: ${{ parameters.BuildToPackage }}
228244
DoFreethreaded: ${{ parameters.DoFreethreaded }}
229245
DoEmbed: ${{ parameters.DoEmbed }}
@@ -240,23 +256,27 @@ stages:
240256
- ${{ if eq(parameters.DoMSI, 'true') }}:
241257
- template: stage-msi.yml
242258
parameters:
259+
pool: ${{ parameters.vmImage }}
243260
BuildToPackage: ${{ parameters.BuildToPackage }}
244261
DoARM64: ${{ parameters.DoARM64}}
245262
DoFreethreaded: ${{ parameters.DoFreethreaded }}
246263
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
247264
- ${{ if eq(parameters.DoMSIX, 'true') }}:
248265
- template: stage-pack-msix.yml
249266
parameters:
267+
pool: ${{ parameters.vmImage }}
250268
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
251269
- ${{ if eq(parameters.DoNuget, 'true') }}:
252270
- template: stage-pack-nuget.yml
253271
parameters:
272+
pool: ${{ parameters.vmImage }}
254273
${{ if eq(parameters.SignNuget, 'true') }}:
255274
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
256275
DoFreethreaded: ${{ parameters.DoFreethreaded }}
257276
- ${{ if eq(parameters.DoPyManager, 'true') }}:
258277
- template: stage-pack-pymanager.yml
259278
parameters:
279+
pool: ${{ parameters.vmImage }}
260280
DoFreethreaded: ${{ parameters.DoFreethreaded }}
261281
DoEmbed: ${{ parameters.DoEmbed }}
262282
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
@@ -266,17 +286,22 @@ stages:
266286
jobs:
267287
- ${{ if eq(parameters.DoEmbed, 'true') }}:
268288
- template: stage-test-embed.yml
289+
parameters:
290+
pool: ${{ parameters.vmImage }}
269291
- ${{ if and(eq(parameters.DoMSI, 'true'), eq(parameters.TestMSI, 'true')) }}:
270292
- template: stage-test-msi.yml
271293
parameters:
294+
pool: ${{ parameters.vmImage }}
272295
DoFreethreaded: ${{ parameters.DoFreethreaded }}
273296
- ${{ if eq(parameters.DoNuget, 'true') }}:
274297
- template: stage-test-nuget.yml
275298
parameters:
299+
pool: ${{ parameters.vmImage }}
276300
DoFreethreaded: ${{ parameters.DoFreethreaded }}
277301
- ${{ if eq(parameters.DoPyManager, 'true') }}:
278302
- template: stage-test-pymanager.yml
279303
parameters:
304+
pool: ${{ parameters.vmImage }}
280305
DoEmbed: ${{ parameters.DoEmbed }}
281306
DoFreethreaded: ${{ parameters.DoFreethreaded }}
282307

@@ -290,16 +315,19 @@ stages:
290315
- ${{ if eq(parameters.DoPyManager, 'true') }}:
291316
- template: stage-publish-pymanager.yml
292317
parameters:
318+
pool: ${{ parameters.vmImage }}
293319
BuildToPublish: ${{ parameters.BuildToPublish }}
294320
DoEmbed: ${{ parameters.DoEmbed }}
295321
DoFreethreaded: ${{ parameters.DoFreethreaded }}
296322
- ${{ if eq(parameters.DoMSI, 'true') }}:
297323
- template: stage-publish-pythonorg.yml
298324
parameters:
325+
pool: ${{ parameters.vmImage }}
299326
BuildToPublish: ${{ parameters.BuildToPublish }}
300327
DoEmbed: ${{ parameters.DoEmbed }}
301328
IncludeGPG: ${{ parameters.DoGPG }}
302329
- ${{ if eq(parameters.DoNuget, 'true') }}:
303330
- template: stage-publish-nugetorg.yml
304331
parameters:
332+
pool: ${{ parameters.vmImage }}
305333
BuildToPublish: ${{ parameters.BuildToPublish }}

‎windows-release/stage-build.yml‎

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
parameters:
2+
pool: windows-latest
3+
arm64pool:
4+
name: 'Windows ARM64'
25
DoPGO: false
36
# DoPGOARM64 only applies if DoPGO is also true
47
DoPGOARM64: true
@@ -10,8 +13,13 @@ parameters:
1013
jobs:
1114
- job: Build_Docs
1215
displayName: Docs build
16+
1317
pool:
14-
vmImage: windows-2022
18+
${{ if containsValue(parameters.pool, name) }}:
19+
${{ each p in parameters.pool }}:
20+
${{ p.key }}: ${{ p.value }}
21+
${{ else }}:
22+
vmImage: ${{ parameters.pool }}
1523

1624
workspace:
1725
clean: all
@@ -41,7 +49,11 @@ jobs:
4149
displayName: Python build
4250

4351
pool:
44-
vmImage: windows-2022
52+
${{ if containsValue(parameters.pool, name) }}:
53+
${{ each p in parameters.pool }}:
54+
${{ p.key }}: ${{ p.value }}
55+
${{ else }}:
56+
vmImage: ${{ parameters.pool }}
4557

4658
workspace:
4759
clean: all
@@ -177,7 +189,11 @@ jobs:
177189
displayName: Python PGO build
178190

179191
pool:
180-
vmImage: windows-2022
192+
${{ if containsValue(parameters.pool, name) }}:
193+
${{ each p in parameters.pool }}:
194+
${{ p.key }}: ${{ p.value }}
195+
${{ else }}:
196+
vmImage: ${{ parameters.pool }}
181197

182198
workspace:
183199
clean: all
@@ -220,7 +236,11 @@ jobs:
220236
displayName: Python PGO build
221237

222238
pool:
223-
vmImage: windows-2022
239+
${{ if containsValue(parameters.pool, name) }}:
240+
${{ each p in parameters.pool }}:
241+
${{ p.key }}: ${{ p.value }}
242+
${{ else }}:
243+
vmImage: ${{ parameters.pool }}
224244

225245
workspace:
226246
clean: all
@@ -263,7 +283,11 @@ jobs:
263283
timeoutInMinutes: 300
264284

265285
pool:
266-
name: 'Windows ARM64'
286+
${{ if containsValue(parameters.arm64pool, name) }}:
287+
${{ each p in parameters.arm64pool }}:
288+
${{ p.key }}: ${{ p.value }}
289+
${{ else }}:
290+
vmImage: ${{ parameters.arm64pool }}
267291

268292
workspace:
269293
clean: all
@@ -300,7 +324,11 @@ jobs:
300324
dependsOn: Build_Python_PGO_2
301325

302326
pool:
303-
vmImage: windows-2022
327+
${{ if containsValue(parameters.pool, name) }}:
328+
${{ each p in parameters.pool }}:
329+
${{ p.key }}: ${{ p.value }}
330+
${{ else }}:
331+
vmImage: ${{ parameters.pool }}
304332

305333
workspace:
306334
clean: all
@@ -340,7 +368,11 @@ jobs:
340368
displayName: Publish Tcl/Tk Library
341369

342370
pool:
343-
vmImage: windows-2022
371+
${{ if containsValue(parameters.pool, name) }}:
372+
${{ each p in parameters.pool }}:
373+
${{ p.key }}: ${{ p.value }}
374+
${{ else }}:
375+
vmImage: ${{ parameters.pool }}
344376

345377
variables:
346378
IncludeLLVM: false

‎windows-release/stage-layout-embed.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
pool: windows-latest
23
BuildToPackage: current
34
SigningCertificate: ''
45

@@ -7,7 +8,11 @@ jobs:
78
displayName: Make embeddable layout
89

910
pool:
10-
vmImage: windows-2022
11+
${{ if containsValue(parameters.pool, name) }}:
12+
${{ each p in parameters.pool }}:
13+
${{ p.key }}: ${{ p.value }}
14+
${{ else }}:
15+
vmImage: ${{ parameters.pool }}
1116

1217
workspace:
1318
clean: all

‎windows-release/stage-layout-full.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
pool: windows-latest
23
BuildToPackage: current
34
DoFreethreaded: false
45
SigningCertificate: ''
@@ -8,7 +9,11 @@ jobs:
89
displayName: Make layouts
910

1011
pool:
11-
vmImage: windows-2022
12+
${{ if containsValue(parameters.pool, name) }}:
13+
${{ each p in parameters.pool }}:
14+
${{ p.key }}: ${{ p.value }}
15+
${{ else }}:
16+
vmImage: ${{ parameters.pool }}
1217

1318
workspace:
1419
clean: all

‎windows-release/stage-layout-msix.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
pool: windows-latest
23
BuildToPackage: current
34
SigningCertificate: ''
45

@@ -7,7 +8,11 @@ jobs:
78
displayName: Make MSIX layout
89

910
pool:
10-
vmImage: windows-2022
11+
${{ if containsValue(parameters.pool, name) }}:
12+
${{ each p in parameters.pool }}:
13+
${{ p.key }}: ${{ p.value }}
14+
${{ else }}:
15+
vmImage: ${{ parameters.pool }}
1116

1217
workspace:
1318
clean: all

‎windows-release/stage-layout-nuget.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
pool: windows-latest
23
BuildToPackage: current
34
DoFreethreaded: false
45
SigningCertificate: ''
@@ -8,7 +9,11 @@ jobs:
89
displayName: Make Nuget layout
910

1011
pool:
11-
vmImage: windows-2022
12+
${{ if containsValue(parameters.pool, name) }}:
13+
${{ each p in parameters.pool }}:
14+
${{ p.key }}: ${{ p.value }}
15+
${{ else }}:
16+
vmImage: ${{ parameters.pool }}
1217

1318
workspace:
1419
clean: all

‎windows-release/stage-layout-pymanager.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
pool: windows-latest
23
BuildToPackage: current
34
DoFreethreaded: false
45
DoEmbed: false
@@ -10,7 +11,11 @@ jobs:
1011
displayName: Make PyManager layouts
1112

1213
pool:
13-
vmImage: windows-2022
14+
${{ if containsValue(parameters.pool, name) }}:
15+
${{ each p in parameters.pool }}:
16+
${{ p.key }}: ${{ p.value }}
17+
${{ else }}:
18+
vmImage: ${{ parameters.pool }}
1419

1520
workspace:
1621
clean: all

‎windows-release/stage-layout-symbols.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
pool: windows-latest
23
BuildToPackage: current
34
DoFreethreaded: false
45
Packages:
@@ -23,7 +24,11 @@ jobs:
2324
displayName: Make symbols layout
2425

2526
pool:
26-
vmImage: windows-2022
27+
${{ if containsValue(parameters.pool, name) }}:
28+
${{ each p in parameters.pool }}:
29+
${{ p.key }}: ${{ p.value }}
30+
${{ else }}:
31+
vmImage: ${{ parameters.pool }}
2732

2833
workspace:
2934
clean: all

‎windows-release/stage-msi.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
parameters:
2+
pool: windows-latest
23
BuildToPackage: current
34
DoARM64: true
45
DoFreethreaded: false
@@ -9,7 +10,11 @@ jobs:
910
displayName: Make MSI
1011

1112
pool:
12-
vmImage: windows-2022
13+
${{ if containsValue(parameters.pool, name) }}:
14+
${{ each p in parameters.pool }}:
15+
${{ p.key }}: ${{ p.value }}
16+
${{ else }}:
17+
vmImage: ${{ parameters.pool }}
1318

1419
variables:
1520
- ${{ if eq(parameters.SigningCertificate, 'PythonSoftwareFoundation') }}:

0 commit comments

Comments
 (0)