Skip to content

Commit 9737ad3

Browse files
authored
Update Windows release machines image to windows-2025 (#344)
Also makes the image a parameter, so that alternate images can easily be tested.
1 parent c6a4d1e commit 9737ad3

20 files changed

+16
-77
lines changed

windows-release/azure-pipelines.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ 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: string
122+
default: windows-2025
119123

120124
resources:
121125
pipelines:
@@ -156,6 +160,8 @@ stages:
156160
- ${{ if and(eq(parameters.BuildToPublish, 'current'), eq(parameters.BuildToPackage, 'current')) }}:
157161
- stage: Build
158162
displayName: Build binaries
163+
pool:
164+
vmImage: ${{ parameters.vmImage }}
159165
jobs:
160166
- template: stage-build.yml
161167
parameters:
@@ -180,6 +186,8 @@ stages:
180186
- stage: Sign
181187
displayName: Sign binaries
182188
dependsOn: Build
189+
pool:
190+
vmImage: ${{ parameters.vmImage }}
183191
jobs:
184192
- template: stage-sign.yml
185193
parameters:
@@ -194,6 +202,8 @@ stages:
194202
${{ else }}:
195203
displayName: Generate layouts from prior build
196204
dependsOn: []
205+
pool:
206+
vmImage: ${{ parameters.vmImage }}
197207
jobs:
198208
- template: stage-layout-full.yml
199209
parameters:
@@ -232,6 +242,8 @@ stages:
232242
- stage: Pack
233243
dependsOn: Layout
234244
displayName: Pack
245+
pool:
246+
vmImage: ${{ parameters.vmImage }}
235247
jobs:
236248
#- ${{ if eq(parameters.DoEmbed, 'true') }}:
237249
# - template: stage-pack-embed.yml
@@ -263,6 +275,8 @@ stages:
263275

264276
- stage: Test
265277
dependsOn: Pack
278+
pool:
279+
vmImage: ${{ parameters.vmImage }}
266280
jobs:
267281
- ${{ if eq(parameters.DoEmbed, 'true') }}:
268282
- template: stage-test-embed.yml
@@ -286,6 +300,8 @@ stages:
286300
dependsOn:
287301
- ${{ if eq(parameters.BuildToPublish, 'current') }}:
288302
- Test
303+
pool:
304+
vmImage: ${{ parameters.vmImage }}
289305
jobs:
290306
- ${{ if eq(parameters.DoPyManager, 'true') }}:
291307
- template: stage-publish-pymanager.yml

windows-release/stage-build.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ parameters:
1010
jobs:
1111
- job: Build_Docs
1212
displayName: Docs build
13-
pool:
14-
vmImage: windows-2022
1513

1614
workspace:
1715
clean: all
@@ -40,9 +38,6 @@ jobs:
4038
- job: Build_Python
4139
displayName: Python build
4240

43-
pool:
44-
vmImage: windows-2022
45-
4641
workspace:
4742
clean: all
4843

@@ -176,9 +171,6 @@ jobs:
176171
- job: Build_Python_PGO_Native
177172
displayName: Python PGO build
178173

179-
pool:
180-
vmImage: windows-2022
181-
182174
workspace:
183175
clean: all
184176

@@ -219,9 +211,6 @@ jobs:
219211
- job: Build_Python_PGO_1
220212
displayName: Python PGO build
221213

222-
pool:
223-
vmImage: windows-2022
224-
225214
workspace:
226215
clean: all
227216

@@ -299,9 +288,6 @@ jobs:
299288
displayName: Merge PGO profile
300289
dependsOn: Build_Python_PGO_2
301290

302-
pool:
303-
vmImage: windows-2022
304-
305291
workspace:
306292
clean: all
307293

@@ -339,9 +325,6 @@ jobs:
339325
- job: TclTk_Lib
340326
displayName: Publish Tcl/Tk Library
341327

342-
pool:
343-
vmImage: windows-2022
344-
345328
variables:
346329
IncludeLLVM: false
347330

windows-release/stage-layout-embed.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ jobs:
66
- job: Make_Embed_Layout
77
displayName: Make embeddable layout
88

9-
pool:
10-
vmImage: windows-2022
11-
129
workspace:
1310
clean: all
1411

windows-release/stage-layout-full.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ jobs:
77
- job: Make_Layouts
88
displayName: Make layouts
99

10-
pool:
11-
vmImage: windows-2022
12-
1310
workspace:
1411
clean: all
1512

windows-release/stage-layout-msix.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ jobs:
66
- job: Make_MSIX_Layout
77
displayName: Make MSIX layout
88

9-
pool:
10-
vmImage: windows-2022
11-
129
workspace:
1310
clean: all
1411

windows-release/stage-layout-nuget.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ jobs:
77
- job: Make_Nuget_Layout
88
displayName: Make Nuget layout
99

10-
pool:
11-
vmImage: windows-2022
12-
1310
workspace:
1411
clean: all
1512

windows-release/stage-layout-pymanager.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ jobs:
99
- job: Make_PyManager_Layouts
1010
displayName: Make PyManager layouts
1111

12-
pool:
13-
vmImage: windows-2022
14-
1512
workspace:
1613
clean: all
1714

windows-release/stage-layout-symbols.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ jobs:
2222
- job: Layout_Symbols
2323
displayName: Make symbols layout
2424

25-
pool:
26-
vmImage: windows-2022
27-
2825
workspace:
2926
clean: all
3027

windows-release/stage-msi.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ jobs:
88
- job: Make_MSI
99
displayName: Make MSI
1010

11-
pool:
12-
vmImage: windows-2022
13-
1411
variables:
1512
- ${{ if eq(parameters.SigningCertificate, 'PythonSoftwareFoundation') }}:
1613
- group: CPythonSign

windows-release/stage-pack-msix.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ jobs:
55
- job: Pack_MSIX
66
displayName: Pack MSIX bundles
77

8-
pool:
9-
vmImage: windows-2022
10-
118
workspace:
129
clean: all
1310

@@ -95,9 +92,6 @@ jobs:
9592
dependsOn:
9693
- Pack_MSIX
9794

98-
pool:
99-
vmImage: windows-2022
100-
10195
workspace:
10296
clean: all
10397

0 commit comments

Comments
 (0)