Skip to content

Commit f260e27

Browse files
zoobazooba
committed
Move all pools (apart from ARM) to main file
1 parent 253bf31 commit f260e27

20 files changed

+14
-237
lines changed

‎windows-release/azure-pipelines.yml‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,8 @@ parameters:
118118
default: false
119119
- name: vmImage
120120
displayName: "VM Image"
121-
type: object
121+
type: string
122122
default: windows-2025
123-
- name: vmImageArm64
124-
displayName: "VM Image (ARM64)"
125-
type: object
126-
default: windows-11-arm
127123

128124
resources:
129125
pipelines:
@@ -164,10 +160,11 @@ stages:
164160
- ${{ if and(eq(parameters.BuildToPublish, 'current'), eq(parameters.BuildToPackage, 'current')) }}:
165161
- stage: Build
166162
displayName: Build binaries
163+
pool:
164+
vmImage: ${{ parameters.vmImage }}
167165
jobs:
168166
- template: stage-build.yml
169167
parameters:
170-
pool: ${{ parameters.vmImage }}
171168
DoFreethreaded: ${{ parameters.DoFreethreaded }}
172169
DoPGO: ${{ parameters.DoPGO }}
173170
DoPGOARM64: ${{ parameters.DoPGOARM64 }}
@@ -189,10 +186,11 @@ stages:
189186
- stage: Sign
190187
displayName: Sign binaries
191188
dependsOn: Build
189+
pool:
190+
vmImage: ${{ parameters.vmImage }}
192191
jobs:
193192
- template: stage-sign.yml
194193
parameters:
195-
pool: ${{ parameters.vmImage }}
196194
SigningCertificate: ${{ parameters.SigningCertificate }}
197195
DoFreethreaded: ${{ parameters.DoFreethreaded }}
198196

@@ -204,42 +202,38 @@ stages:
204202
${{ else }}:
205203
displayName: Generate layouts from prior build
206204
dependsOn: []
205+
pool:
206+
vmImage: ${{ parameters.vmImage }}
207207
jobs:
208208
- template: stage-layout-full.yml
209209
parameters:
210-
pool: ${{ parameters.vmImage }}
211210
BuildToPackage: ${{ parameters.BuildToPackage }}
212211
DoFreethreaded: ${{ parameters.DoFreethreaded }}
213212
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
214213
- template: stage-layout-symbols.yml
215214
parameters:
216-
pool: ${{ parameters.vmImage }}
217215
BuildToPackage: ${{ parameters.BuildToPackage }}
218216
DoFreethreaded: ${{ parameters.DoFreethreaded }}
219217
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
220218
- ${{ if eq(parameters.DoEmbed, 'true') }}:
221219
- template: stage-layout-embed.yml
222220
parameters:
223-
pool: ${{ parameters.vmImage }}
224221
BuildToPackage: ${{ parameters.BuildToPackage }}
225222
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
226223
- ${{ if eq(parameters.DoNuget, 'true') }}:
227224
- template: stage-layout-nuget.yml
228225
parameters:
229-
pool: ${{ parameters.vmImage }}
230226
BuildToPackage: ${{ parameters.BuildToPackage }}
231227
DoFreethreaded: ${{ parameters.DoFreethreaded }}
232228
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
233229
- ${{ if eq(parameters.DoMSIX, 'true') }}:
234230
- template: stage-layout-msix.yml
235231
parameters:
236-
pool: ${{ parameters.vmImage }}
237232
BuildToPackage: ${{ parameters.BuildToPackage }}
238233
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
239234
- ${{ if eq(parameters.DoPyManager, 'true') }}:
240235
- template: stage-layout-pymanager.yml
241236
parameters:
242-
pool: ${{ parameters.vmImage }}
243237
BuildToPackage: ${{ parameters.BuildToPackage }}
244238
DoFreethreaded: ${{ parameters.DoFreethreaded }}
245239
DoEmbed: ${{ parameters.DoEmbed }}
@@ -248,6 +242,8 @@ stages:
248242
- stage: Pack
249243
dependsOn: Layout
250244
displayName: Pack
245+
pool:
246+
vmImage: ${{ parameters.vmImage }}
251247
jobs:
252248
#- ${{ if eq(parameters.DoEmbed, 'true') }}:
253249
# - template: stage-pack-embed.yml
@@ -256,52 +252,45 @@ stages:
256252
- ${{ if eq(parameters.DoMSI, 'true') }}:
257253
- template: stage-msi.yml
258254
parameters:
259-
pool: ${{ parameters.vmImage }}
260255
BuildToPackage: ${{ parameters.BuildToPackage }}
261256
DoARM64: ${{ parameters.DoARM64}}
262257
DoFreethreaded: ${{ parameters.DoFreethreaded }}
263258
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
264259
- ${{ if eq(parameters.DoMSIX, 'true') }}:
265260
- template: stage-pack-msix.yml
266261
parameters:
267-
pool: ${{ parameters.vmImage }}
268262
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
269263
- ${{ if eq(parameters.DoNuget, 'true') }}:
270264
- template: stage-pack-nuget.yml
271265
parameters:
272-
pool: ${{ parameters.vmImage }}
273266
${{ if eq(parameters.SignNuget, 'true') }}:
274267
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
275268
DoFreethreaded: ${{ parameters.DoFreethreaded }}
276269
- ${{ if eq(parameters.DoPyManager, 'true') }}:
277270
- template: stage-pack-pymanager.yml
278271
parameters:
279-
pool: ${{ parameters.vmImage }}
280272
DoFreethreaded: ${{ parameters.DoFreethreaded }}
281273
DoEmbed: ${{ parameters.DoEmbed }}
282274
SigningCertificate: ${{ iif(eq(parameters.SigningCertificate, 'Unsigned'), '', parameters.SigningCertificate) }}
283275

284276
- stage: Test
285277
dependsOn: Pack
278+
pool:
279+
vmImage: ${{ parameters.vmImage }}
286280
jobs:
287281
- ${{ if eq(parameters.DoEmbed, 'true') }}:
288282
- template: stage-test-embed.yml
289-
parameters:
290-
pool: ${{ parameters.vmImage }}
291283
- ${{ if and(eq(parameters.DoMSI, 'true'), eq(parameters.TestMSI, 'true')) }}:
292284
- template: stage-test-msi.yml
293285
parameters:
294-
pool: ${{ parameters.vmImage }}
295286
DoFreethreaded: ${{ parameters.DoFreethreaded }}
296287
- ${{ if eq(parameters.DoNuget, 'true') }}:
297288
- template: stage-test-nuget.yml
298289
parameters:
299-
pool: ${{ parameters.vmImage }}
300290
DoFreethreaded: ${{ parameters.DoFreethreaded }}
301291
- ${{ if eq(parameters.DoPyManager, 'true') }}:
302292
- template: stage-test-pymanager.yml
303293
parameters:
304-
pool: ${{ parameters.vmImage }}
305294
DoEmbed: ${{ parameters.DoEmbed }}
306295
DoFreethreaded: ${{ parameters.DoFreethreaded }}
307296

@@ -311,23 +300,22 @@ stages:
311300
dependsOn:
312301
- ${{ if eq(parameters.BuildToPublish, 'current') }}:
313302
- Test
303+
pool:
304+
vmImage: ${{ parameters.vmImage }}
314305
jobs:
315306
- ${{ if eq(parameters.DoPyManager, 'true') }}:
316307
- template: stage-publish-pymanager.yml
317308
parameters:
318-
pool: ${{ parameters.vmImage }}
319309
BuildToPublish: ${{ parameters.BuildToPublish }}
320310
DoEmbed: ${{ parameters.DoEmbed }}
321311
DoFreethreaded: ${{ parameters.DoFreethreaded }}
322312
- ${{ if eq(parameters.DoMSI, 'true') }}:
323313
- template: stage-publish-pythonorg.yml
324314
parameters:
325-
pool: ${{ parameters.vmImage }}
326315
BuildToPublish: ${{ parameters.BuildToPublish }}
327316
DoEmbed: ${{ parameters.DoEmbed }}
328317
IncludeGPG: ${{ parameters.DoGPG }}
329318
- ${{ if eq(parameters.DoNuget, 'true') }}:
330319
- template: stage-publish-nugetorg.yml
331320
parameters:
332-
pool: ${{ parameters.vmImage }}
333321
BuildToPublish: ${{ parameters.BuildToPublish }}

‎windows-release/stage-build.yml‎

Lines changed: 1 addition & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
parameters:
2-
pool: windows-latest
3-
arm64pool:
4-
name: 'Windows ARM64'
52
DoPGO: false
63
# DoPGOARM64 only applies if DoPGO is also true
74
DoPGOARM64: true
@@ -14,13 +11,6 @@ jobs:
1411
- job: Build_Docs
1512
displayName: Docs build
1613

17-
pool:
18-
${{ if containsValue(parameters.pool, 'name') }}:
19-
${{ each p in parameters.pool }}:
20-
${{ p.key }}: ${{ p.value }}
21-
${{ else }}:
22-
vmImage: ${{ parameters.pool }}
23-
2414
workspace:
2515
clean: all
2616

@@ -48,13 +38,6 @@ jobs:
4838
- job: Build_Python
4939
displayName: Python build
5040

51-
pool:
52-
${{ if containsValue(parameters.pool, 'name') }}:
53-
${{ each p in parameters.pool }}:
54-
${{ p.key }}: ${{ p.value }}
55-
${{ else }}:
56-
vmImage: ${{ parameters.pool }}
57-
5841
workspace:
5942
clean: all
6043

@@ -188,13 +171,6 @@ jobs:
188171
- job: Build_Python_PGO_Native
189172
displayName: Python PGO build
190173

191-
pool:
192-
${{ if containsValue(parameters.pool, 'name') }}:
193-
${{ each p in parameters.pool }}:
194-
${{ p.key }}: ${{ p.value }}
195-
${{ else }}:
196-
vmImage: ${{ parameters.pool }}
197-
198174
workspace:
199175
clean: all
200176

@@ -235,13 +211,6 @@ jobs:
235211
- job: Build_Python_PGO_1
236212
displayName: Python PGO build
237213

238-
pool:
239-
${{ if containsValue(parameters.pool, 'name') }}:
240-
${{ each p in parameters.pool }}:
241-
${{ p.key }}: ${{ p.value }}
242-
${{ else }}:
243-
vmImage: ${{ parameters.pool }}
244-
245214
workspace:
246215
clean: all
247216

@@ -283,11 +252,7 @@ jobs:
283252
timeoutInMinutes: 300
284253

285254
pool:
286-
${{ if containsValue(parameters.arm64pool, 'name') }}:
287-
${{ each p in parameters.arm64pool }}:
288-
${{ p.key }}: ${{ p.value }}
289-
${{ else }}:
290-
vmImage: ${{ parameters.arm64pool }}
255+
vmImage: windows-11-arm
291256

292257
workspace:
293258
clean: all
@@ -323,13 +288,6 @@ jobs:
323288
displayName: Merge PGO profile
324289
dependsOn: Build_Python_PGO_2
325290

326-
pool:
327-
${{ if containsValue(parameters.pool, 'name') }}:
328-
${{ each p in parameters.pool }}:
329-
${{ p.key }}: ${{ p.value }}
330-
${{ else }}:
331-
vmImage: ${{ parameters.pool }}
332-
333291
workspace:
334292
clean: all
335293

@@ -367,13 +325,6 @@ jobs:
367325
- job: TclTk_Lib
368326
displayName: Publish Tcl/Tk Library
369327

370-
pool:
371-
${{ if containsValue(parameters.pool, 'name') }}:
372-
${{ each p in parameters.pool }}:
373-
${{ p.key }}: ${{ p.value }}
374-
${{ else }}:
375-
vmImage: ${{ parameters.pool }}
376-
377328
variables:
378329
IncludeLLVM: false
379330

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
parameters:
2-
pool: windows-latest
32
BuildToPackage: current
43
SigningCertificate: ''
54

65
jobs:
76
- job: Make_Embed_Layout
87
displayName: Make embeddable layout
98

10-
pool:
11-
${{ if containsValue(parameters.pool, 'name') }}:
12-
${{ each p in parameters.pool }}:
13-
${{ p.key }}: ${{ p.value }}
14-
${{ else }}:
15-
vmImage: ${{ parameters.pool }}
16-
179
workspace:
1810
clean: all
1911

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
pool: windows-latest
32
BuildToPackage: current
43
DoFreethreaded: false
54
SigningCertificate: ''
@@ -8,13 +7,6 @@ jobs:
87
- job: Make_Layouts
98
displayName: Make layouts
109

11-
pool:
12-
${{ if containsValue(parameters.pool, 'name') }}:
13-
${{ each p in parameters.pool }}:
14-
${{ p.key }}: ${{ p.value }}
15-
${{ else }}:
16-
vmImage: ${{ parameters.pool }}
17-
1810
workspace:
1911
clean: all
2012

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
parameters:
2-
pool: windows-latest
32
BuildToPackage: current
43
SigningCertificate: ''
54

65
jobs:
76
- job: Make_MSIX_Layout
87
displayName: Make MSIX layout
98

10-
pool:
11-
${{ if containsValue(parameters.pool, 'name') }}:
12-
${{ each p in parameters.pool }}:
13-
${{ p.key }}: ${{ p.value }}
14-
${{ else }}:
15-
vmImage: ${{ parameters.pool }}
16-
179
workspace:
1810
clean: all
1911

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
pool: windows-latest
32
BuildToPackage: current
43
DoFreethreaded: false
54
SigningCertificate: ''
@@ -8,13 +7,6 @@ jobs:
87
- job: Make_Nuget_Layout
98
displayName: Make Nuget layout
109

11-
pool:
12-
${{ if containsValue(parameters.pool, 'name') }}:
13-
${{ each p in parameters.pool }}:
14-
${{ p.key }}: ${{ p.value }}
15-
${{ else }}:
16-
vmImage: ${{ parameters.pool }}
17-
1810
workspace:
1911
clean: all
2012

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
pool: windows-latest
32
BuildToPackage: current
43
DoFreethreaded: false
54
DoEmbed: false
@@ -10,13 +9,6 @@ jobs:
109
- job: Make_PyManager_Layouts
1110
displayName: Make PyManager layouts
1211

13-
pool:
14-
${{ if containsValue(parameters.pool, 'name') }}:
15-
${{ each p in parameters.pool }}:
16-
${{ p.key }}: ${{ p.value }}
17-
${{ else }}:
18-
vmImage: ${{ parameters.pool }}
19-
2012
workspace:
2113
clean: all
2214

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
parameters:
2-
pool: windows-latest
32
BuildToPackage: current
43
DoFreethreaded: false
54
Packages:
@@ -23,13 +22,6 @@ jobs:
2322
- job: Layout_Symbols
2423
displayName: Make symbols layout
2524

26-
pool:
27-
${{ if containsValue(parameters.pool, 'name') }}:
28-
${{ each p in parameters.pool }}:
29-
${{ p.key }}: ${{ p.value }}
30-
${{ else }}:
31-
vmImage: ${{ parameters.pool }}
32-
3325
workspace:
3426
clean: all
3527

0 commit comments

Comments
 (0)